diff -r 000000000000 -r 6474c204b198 mobile/android/tests/background/junit3/src/db/TestFennecTabsStorage.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mobile/android/tests/background/junit3/src/db/TestFennecTabsStorage.java	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,197 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+package org.mozilla.gecko.background.db;
+
+import org.json.simple.JSONArray;
+import org.mozilla.gecko.db.BrowserContract;
+import org.mozilla.gecko.sync.repositories.android.BrowserContractHelpers;
+
+import android.app.Activity;
+import android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.RemoteException;
+import android.test.ActivityInstrumentationTestCase2;
+
+/**
+ * Exercise Fennec's tabs provider.
+ *
+ * @author rnewman
+ *
+ */
+public class TestFennecTabsStorage extends ActivityInstrumentationTestCase2<Activity> {
+  public static final String TEST_CLIENT_GUID = "test guid"; // Real GUIDs never contain spaces.
+  public static final String TEST_CLIENT_NAME = "test client name";
+
+  public static final String TABS_CLIENT_GUID_IS = BrowserContract.Tabs.CLIENT_GUID + " = ?";
+
+  protected Tab testTab1;
+  protected Tab testTab2;
+  protected Tab testTab3;
+
+  public TestFennecTabsStorage() {
+    super(Activity.class);
+  }
+
+  protected ContentProviderClient getClientsClient() {
+    final ContentResolver cr = getInstrumentation().getTargetContext().getApplicationContext().getContentResolver();
+    return cr.acquireContentProviderClient(BrowserContractHelpers.CLIENTS_CONTENT_URI);
+  }
+
+  protected ContentProviderClient getTabsClient() {
+    final ContentResolver cr = getInstrumentation().getTargetContext().getApplicationContext().getContentResolver();
+    return cr.acquireContentProviderClient(BrowserContractHelpers.TABS_CONTENT_URI);
+  }
+
+  protected int deleteAllTestTabs(final ContentProviderClient tabsClient) throws RemoteException {
+    if (tabsClient == null) {
+      return -1;
+    }
+    return tabsClient.delete(BrowserContractHelpers.TABS_CONTENT_URI, TABS_CLIENT_GUID_IS, new String[] { TEST_CLIENT_GUID });
+  }
+
+  @Override
+  protected void tearDown() throws Exception {
+    deleteAllTestTabs(getTabsClient());
+  }
+
+  @SuppressWarnings("unchecked")
+  protected void insertSomeTestTabs(ContentProviderClient tabsClient) throws RemoteException {
+    final JSONArray history1 = new JSONArray();
+    history1.add("http://test.com/test1.html");
+    testTab1 = new Tab("test title 1", "http://test.com/test1.png", history1, 1000);
+
+    final JSONArray history2 = new JSONArray();
+    history2.add("http://test.com/test2.html#1");
+    history2.add("http://test.com/test2.html#2");
+    history2.add("http://test.com/test2.html#3");
+    testTab2 = new Tab("test title 2", "http://test.com/test2.png", history2, 2000);
+
+    final JSONArray history3 = new JSONArray();
+    history3.add("http://test.com/test3.html#1");
+    history3.add("http://test.com/test3.html#2");
+    testTab3 = new Tab("test title 3", "http://test.com/test3.png", history3, 3000);
+
+    tabsClient.insert(BrowserContractHelpers.TABS_CONTENT_URI, testTab1.toContentValues(TEST_CLIENT_GUID, 0));
+    tabsClient.insert(BrowserContractHelpers.TABS_CONTENT_URI, testTab2.toContentValues(TEST_CLIENT_GUID, 1));
+    tabsClient.insert(BrowserContractHelpers.TABS_CONTENT_URI, testTab3.toContentValues(TEST_CLIENT_GUID, 2));
+  }
+
+  // Sanity.
+  public void testObtainCP() {
+    final ContentProviderClient clientsClient = getClientsClient();
+    assertNotNull(clientsClient);
+    clientsClient.release();
+
+    final ContentProviderClient tabsClient = getTabsClient();
+    assertNotNull(tabsClient);
+    tabsClient.release();
+  }
+
+  public void testWipeClients() throws RemoteException {
+    final Uri uri = BrowserContractHelpers.CLIENTS_CONTENT_URI;
+    final ContentProviderClient clientsClient = getClientsClient();
+
+    // Have to ensure that it's empty…
+    clientsClient.delete(uri, null, null);
+
+    int deleted = clientsClient.delete(uri, null, null);
+    assertEquals(0, deleted);
+  }
+
+  public void testWipeTabs() throws RemoteException {
+    final ContentProviderClient tabsClient = getTabsClient();
+
+    // Have to ensure that it's empty…
+    deleteAllTestTabs(tabsClient);
+
+    int deleted = deleteAllTestTabs(tabsClient);
+    assertEquals(0, deleted);
+  }
+
+  public void testStoreAndRetrieveClients() throws RemoteException {
+    final Uri uri = BrowserContractHelpers.CLIENTS_CONTENT_URI;
+    final ContentProviderClient clientsClient = getClientsClient();
+
+    // Have to ensure that it's empty…
+    clientsClient.delete(uri, null, null);
+
+    final long now = System.currentTimeMillis();
+    final ContentValues first = new ContentValues();
+    final ContentValues second = new ContentValues();
+    first.put(BrowserContract.Clients.GUID, "abcdefghijkl");
+    first.put(BrowserContract.Clients.NAME, "Frist Psot");
+    first.put(BrowserContract.Clients.LAST_MODIFIED, now + 1);
+    second.put(BrowserContract.Clients.GUID, "mnopqrstuvwx");
+    second.put(BrowserContract.Clients.NAME, "Second!!1!");
+    second.put(BrowserContract.Clients.LAST_MODIFIED, now + 2);
+
+    ContentValues[] values = new ContentValues[] { first, second };
+    final int inserted = clientsClient.bulkInsert(uri, values);
+    assertEquals(2, inserted);
+
+    final String since = BrowserContract.Clients.LAST_MODIFIED + " >= ?";
+    final String[] nowArg = new String[] { String.valueOf(now) };
+    final String guidAscending = BrowserContract.Clients.GUID + " ASC";
+    Cursor cursor = clientsClient.query(uri, null, since, nowArg, guidAscending);
+
+    assertNotNull(cursor);
+    try {
+      assertTrue(cursor.moveToFirst());
+      assertEquals(2, cursor.getCount());
+
+      final String g1 = cursor.getString(cursor.getColumnIndexOrThrow(BrowserContract.Clients.GUID));
+      final String n1 = cursor.getString(cursor.getColumnIndexOrThrow(BrowserContract.Clients.NAME));
+      final long m1   = cursor.getLong(cursor.getColumnIndexOrThrow(BrowserContract.Clients.LAST_MODIFIED));
+      assertEquals(first.get(BrowserContract.Clients.GUID), g1);
+      assertEquals(first.get(BrowserContract.Clients.NAME), n1);
+      assertEquals(now + 1, m1);
+
+      assertTrue(cursor.moveToNext());
+      final String g2 = cursor.getString(cursor.getColumnIndexOrThrow(BrowserContract.Clients.GUID));
+      final String n2 = cursor.getString(cursor.getColumnIndexOrThrow(BrowserContract.Clients.NAME));
+      final long m2   = cursor.getLong(cursor.getColumnIndexOrThrow(BrowserContract.Clients.LAST_MODIFIED));
+      assertEquals(second.get(BrowserContract.Clients.GUID), g2);
+      assertEquals(second.get(BrowserContract.Clients.NAME), n2);
+      assertEquals(now + 2, m2);
+
+      assertFalse(cursor.moveToNext());
+    } finally {
+      cursor.close();
+    }
+
+    int deleted = clientsClient.delete(uri, null, null);
+    assertEquals(2, deleted);
+  }
+
+  public void testTabFromCursor() throws Exception {
+    final ContentProviderClient tabsClient = getTabsClient();
+
+    deleteAllTestTabs(tabsClient);
+    insertSomeTestTabs(tabsClient);
+
+    final String positionAscending = BrowserContract.Tabs.POSITION + " ASC";
+    Cursor cursor = null;
+    try {
+      cursor = tabsClient.query(BrowserContractHelpers.TABS_CONTENT_URI, null, TABS_CLIENT_GUID_IS, new String[] { TEST_CLIENT_GUID }, positionAscending);
+      assertEquals(3, cursor.getCount());
+
+      cursor.moveToFirst();
+      final Tab parsed1 = Tab.fromCursor(cursor);
+      assertEquals(testTab1, parsed1);
+
+      cursor.moveToNext();
+      final Tab parsed2 = Tab.fromCursor(cursor);
+      assertEquals(testTab2, parsed2);
+
+      cursor.moveToPosition(2);
+      final Tab parsed3 = Tab.fromCursor(cursor);
+      assertEquals(testTab3, parsed3);
+    } finally {
+      cursor.close();
+    }
+  }
+}