diff -r 000000000000 -r 6474c204b198 mobile/android/base/tests/DatabaseHelper.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mobile/android/base/tests/DatabaseHelper.java	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,151 @@
+package org.mozilla.gecko.tests;
+
+import java.util.ArrayList;
+
+import org.mozilla.gecko.AppConstants;
+import org.mozilla.gecko.Assert;
+import org.mozilla.gecko.GeckoProfile;
+import org.mozilla.gecko.db.BrowserDB;
+
+import android.app.Activity;
+import android.content.ContentResolver;
+import android.database.Cursor;
+import android.net.Uri;
+
+class DatabaseHelper {
+    protected enum BrowserDataType {BOOKMARKS, HISTORY};
+    private Activity mActivity;
+    private Assert mAsserter;
+
+    public DatabaseHelper(Activity activity, Assert asserter) {
+        mActivity = activity;
+        mAsserter = asserter;
+    }
+    /**
+    * This method can be used to check if an URL is present in the bookmarks database
+    */
+    protected boolean isBookmark(String url) {
+        final ContentResolver resolver = mActivity.getContentResolver();
+        return BrowserDB.isBookmark(resolver, url);
+    }
+
+    protected Uri buildUri(BrowserDataType dataType) {
+        Uri uri = null;
+        if (dataType == BrowserDataType.BOOKMARKS || dataType == BrowserDataType.HISTORY) {
+            uri = Uri.parse("content://" + AppConstants.ANDROID_PACKAGE_NAME + ".db.browser/" + dataType.toString().toLowerCase());
+        } else {
+           mAsserter.ok(false, "The wrong data type has been provided = " + dataType.toString(), "Please provide the correct data type");
+        }
+        uri = uri.buildUpon().appendQueryParameter("profile", GeckoProfile.DEFAULT_PROFILE)
+                             .appendQueryParameter("sync", "true").build();
+        return uri;
+    }
+
+    /**
+     * Adds a bookmark, or updates the bookmark title if the url already exists.
+     *
+     * The LocalBrowserDB.addBookmark implementation handles updating existing bookmarks.
+     */
+    protected void addOrUpdateMobileBookmark(String title, String url) {
+        final ContentResolver resolver = mActivity.getContentResolver();
+        BrowserDB.addBookmark(resolver, title, url);
+        mAsserter.ok(true, "Inserting/updating a new bookmark", "Inserting/updating the bookmark with the title = " + title + " and the url = " + url);
+    }
+
+    /**
+     * Updates the title and keyword of a bookmark with the given URL.
+     *
+     * Warning: This method assumes that there's only one bookmark with the given URL.
+     */
+    protected void updateBookmark(String url, String title, String keyword) {
+        final ContentResolver resolver = mActivity.getContentResolver();
+        // Get the id for the bookmark with the given URL.
+        Cursor c = null;
+        try {
+            c = BrowserDB.getBookmarkForUrl(resolver, url);
+            if (!c.moveToFirst()) {
+                mAsserter.ok(false, "Getting bookmark with url", "Couldn't find bookmark with url = " + url);
+                return;
+            }
+
+            int id = c.getInt(c.getColumnIndexOrThrow("_id"));
+            BrowserDB.updateBookmark(resolver, id, url, title, keyword);
+
+            mAsserter.ok(true, "Updating bookmark", "Updating bookmark with url = " + url);
+        } finally {
+            if (c != null) {
+                c.close();
+            }
+        }
+    }
+
+    protected void deleteBookmark(String url) {
+        final ContentResolver resolver = mActivity.getContentResolver();
+        BrowserDB.removeBookmarksWithURL(resolver, url);
+    }
+
+    protected void deleteHistoryItem(String url) {
+        final ContentResolver resolver = mActivity.getContentResolver();
+        BrowserDB.removeHistoryEntry(resolver, url);
+    }
+
+    // About the same implementation as getFolderIdFromGuid from LocalBrowserDB because it is declared private and we can't use reflections to access it
+    protected long getFolderIdFromGuid(String guid) {
+        ContentResolver resolver = mActivity.getContentResolver();
+        long folderId = Long.valueOf(-1);
+        Uri bookmarksUri = buildUri(BrowserDataType.BOOKMARKS);
+        Cursor c = null;
+        try {
+            c = resolver.query(bookmarksUri,
+                               new String[] { "_id" },
+                               "guid = ?",
+                               new String[] { guid },
+                               null);
+            if (c.moveToFirst()) {
+                folderId = c.getLong(c.getColumnIndexOrThrow("_id"));
+            }
+            if (folderId == -1) {
+                mAsserter.ok(false, "Trying to get the folder id" ,"We did not get the correct folder id");
+            }
+        } finally {
+            if (c != null) {
+                c.close();
+            }
+        }
+        return folderId;
+    }
+
+     /**
+     * @param  a BrowserDataType value - either HISTORY or BOOKMARKS
+     * @return an ArrayList of the urls in the Firefox for Android Bookmarks or History databases
+     */
+    protected ArrayList<String> getBrowserDBUrls(BrowserDataType dataType) {
+        ArrayList<String> browserData = new ArrayList<String>();
+        ContentResolver resolver = mActivity.getContentResolver();
+        Cursor cursor = null;
+        Uri uri = buildUri(dataType);
+        if (dataType == BrowserDataType.HISTORY) {
+            cursor = BrowserDB.getAllVisitedHistory(resolver);
+        } else if (dataType == BrowserDataType.BOOKMARKS) {
+            cursor = BrowserDB.getBookmarksInFolder(resolver, getFolderIdFromGuid("mobile"));
+        }
+        if (cursor != null) {
+            cursor.moveToFirst();
+            for (int i = 0; i < cursor.getCount(); i++ ) {
+                 // The url field may be null for folders in the structure of the Bookmarks table for Firefox so we should eliminate those
+                if (cursor.getString(cursor.getColumnIndex("url")) != null) {
+                    browserData.add(cursor.getString(cursor.getColumnIndex("url")));
+                }
+                if(!cursor.isLast()) {
+                    cursor.moveToNext();
+                }
+            }
+        } else {
+             mAsserter.ok(false, "We could not retrieve any data from the database", "The cursor was null");
+        }
+        if (cursor != null) {
+            cursor.close();
+        }
+        return browserData;
+    }
+}