--- a/mobile/android/base/tests/testBrowserProvider.java
+++ b/mobile/android/base/tests/testBrowserProvider.java
@@ -8,17 +8,16 @@ import android.content.OperationApplicat
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Build;
 import android.util.Log;
 
 import java.util.ArrayList;
 import java.util.Random;
 
-import org.mozilla.gecko.background.db.CursorDumper;
 import org.mozilla.gecko.db.BrowserContract;
 
 /*
  * This test is meant to exercise all operations exposed by Fennec's
  * history and bookmarks content provider. It does so in an isolated
  * environment (see ContentProviderTest) without affecting any UI-related
  * code.
  */
@@ -1864,9 +1863,81 @@ public class testBrowserProvider extends
      */
     private void assertCountIsAndClose(Cursor c, int expectedCount, String message) {
         try {
             mAsserter.is(c.getCount(), expectedCount, message);
         } finally {
             c.close();
         }
     }
+
+    /**
+     * Pilfered from Android Background Services code.
+     */
+    public static class CursorDumper {
+        protected static String fixedWidth(int width, String s) {
+            if (s == null) {
+                return spaces(width);
+            }
+            int length = s.length();
+            if (width == length) {
+                return s;
+            }
+            if (width > length) {
+                return s + spaces(width - length);
+            }
+            return s.substring(0, width);
+        }
+
+        protected static String spaces(int i) {
+            return "                                     ".substring(0, i);
+        }
+
+        protected static String dashes(int i) {
+            return "-------------------------------------".substring(0, i);
+        }
+
+        public static void dumpCursor(Cursor cursor) {
+            dumpCursor(cursor, 18, "records");
+        }
+
+        protected static void dumpCursor(Cursor cursor, int columnWidth,
+                                         String tags) {
+            int originalPosition = cursor.getPosition();
+            try {
+                String[] columnNames = cursor.getColumnNames();
+                int columnCount = cursor.getColumnCount();
+
+                for (int i = 0; i < columnCount; ++i) {
+                    System.out.print(fixedWidth(columnWidth, columnNames[i]) +
+                                     " | ");
+                }
+                System.out.println("(" + cursor.getCount() + " " + tags + ")");
+                for (int i = 0; i < columnCount; ++i) {
+                    System.out.print(dashes(columnWidth) + " | ");
+                }
+                System.out.println("");
+                if (!cursor.moveToFirst()) {
+                    System.out.println("EMPTY");
+                    return;
+                }
+
+                cursor.moveToFirst();
+                while (!cursor.isAfterLast()) {
+                    for (int i = 0; i < columnCount; ++i) {
+                        System.out.print(fixedWidth(columnWidth,
+                                                    cursor.getString(i)) +
+                                         " | ");
+                    }
+                    System.out.println("");
+                    cursor.moveToNext();
+                }
+                for (int i = 0; i < columnCount - 1; ++i) {
+                    System.out.print(dashes(columnWidth + 3));
+                }
+                System.out.print(dashes(columnWidth + 3 - 1));
+                System.out.println("");
+            } finally {
+                cursor.moveToPosition(originalPosition);
+            }
+        }
+    }
 }