Bug 715274 - Fix testBookmark now that we remove the folder header instead of hide it. [r=wesj]

mobile/android/base/tests/testBookmark.java.in

@@ -78,10 +78,10 @@ public class testBookmark extends BaseTest  {
         mAsserter.ok(bookmarksList != null, "checking that bookmarks list exists", "bookmarks list exists");
 
         // No folders should be visible if no desktop bookmarks exist
-        mAsserter.is(bookmarksList.getChildCount(), 5,
-            "bookmarks list has 5 children (the default bookmarks and the hidden header)");
+        mAsserter.is(bookmarksList.getChildCount(), 4,
+            "bookmarks list has 4 children (the default bookmarks)");
 
-        for (int i = 1; i < bookmarksList.getChildCount(); i++) {
+        for (int i = 0; i < bookmarksList.getChildCount(); i++) {
             Cursor c = (Cursor)bookmarksList.getItemAtPosition(i);
             String url = c.getString(c.getColumnIndexOrThrow("url"));
             mAsserter.ok(Arrays.binarySearch(defaultBookmarks, url) > -1,
@@ -91,13 +91,12 @@ public class testBookmark extends BaseTest  {
         insertOneBookmark();
         mSolo.waitForText(BOOKMARK_TITLE);
 
-        mAsserter.is(bookmarksList.getChildCount(), 6,
-            "bookmarks list has 6 children (the default bookmarks, the new one, and the hidden header)");
+        mAsserter.is(bookmarksList.getChildCount(), 5,
+            "bookmarks list has 5 children (the default bookmarks and the new one)");
  
-        // Click on the bookmark we created (the first item is the header view)
-        // and wait for the bookmarked page to load
+        // Click on the bookmark we created and wait for the bookmarked page to load
         Actions.EventExpecter contentEventExpecter = mActions.expectGeckoEvent("DOMContentLoaded");
-        mSolo.clickInList(2);
+        mSolo.clickInList(1);
         contentEventExpecter.blockForEvent();
 
         // Clean up the bookmark we created