roytam1/palemoon27
1
0
Fork 0
mirror of https://github.com/roytam1/palemoon27.git synced 2026-06-05 16:09:02 +00:00
Code Issues Projects Releases Wiki Activity

Prep tree for forward-porting Goanna, stage 1

Browse Source
This commit is contained in:
wolfbeast
2016-03-23 10:12:30 +01:00
committed by roytam1
parent 5d59e0437f
commit 5ee6187aad
1539 changed files with 7733 additions and 7733 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/android/base/tests/testImportFromAndroid.java
+3 -3
View File
@@ -8,7 +8,7 @@ import java.util.ArrayList;
import org.mozilla.gecko.Actions;
import org.mozilla.gecko.AppConstants;
import org.mozilla.gecko.GeckoProfile;
import org.mozilla.gecko.GoannaProfile;
import android.content.ContentResolver;
import android.content.ContentValues;
@@ -35,7 +35,7 @@ public class testImportFromAndroid extends AboutHomeTest {
ArrayList<String> firefoxBookmarks = new ArrayList<String>();
ArrayList<String> oldFirefoxHistory = new ArrayList<String>();
ArrayList<String> oldFirefoxBookmarks = new ArrayList<String>();
blockForGeckoReady();
blockForGoannaReady();
// Get the Android history
androidData = getAndroidUrls("history");
@@ -120,7 +120,7 @@ public class testImportFromAndroid extends AboutHomeTest {
// Add a few history items in Firefox Mobile
ContentResolver resolver = getActivity().getContentResolver();
Uri uri = Uri.parse("content://" + AppConstants.ANDROID_PACKAGE_NAME + ".db.browser/history");
uri = uri.buildUpon().appendQueryParameter("profile", GeckoProfile.DEFAULT_PROFILE)
uri = uri.buildUpon().appendQueryParameter("profile", GoannaProfile.DEFAULT_PROFILE)
.appendQueryParameter("sync", "true").build();
for (String url:androidData) {
// Add every 3rd website from Android History to Firefox Mobile