Move BookmarksBridge into package with other bookmarks classes.

chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/BookmarksTest.java

Index: chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/BookmarksTest.java
diff --git a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/BookmarksTest.java b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/BookmarksTest.java
index 9719983cd8e9b47977220e385ac451de656c83f1..d2e2aa833f1a64ca2ff58f9a88150044c1f413dd 100644
--- a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/BookmarksTest.java
+++ b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/BookmarksTest.java
@@ -9,7 +9,7 @@ import android.util.Pair;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Feature;
-import org.chromium.chrome.browser.bookmark.BookmarksBridge;
+import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.test.util.browser.sync.SyncTestUtil;
 import org.chromium.components.bookmarks.BookmarkId;
@@ -37,7 +37,7 @@ public class BookmarksTest extends SyncTestBase {
     private static final String MODIFIED_TITLE = "Chromium2";
     private static final String FOLDER_TITLE = "Tech";
 
-    private BookmarksBridge mBookmarksBridge;
+    private BookmarkBridge mBookmarkBridge;
 
     // A container to store bookmark information for data verification.
     private static class Bookmark {
@@ -78,10 +78,10 @@ public class BookmarksTest extends SyncTestBase {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                mBookmarksBridge = new BookmarksBridge(Profile.getLastUsedProfile());
-                // The BookmarksBridge needs to know how to handle partner bookmarks.
+                mBookmarkBridge = new BookmarkBridge(Profile.getLastUsedProfile());
+                // The BookmarkBridge needs to know how to handle partner bookmarks.
                 // Without this call to fake that knowledge for testing, it crashes.
-                mBookmarksBridge.loadEmptyPartnerBookmarkShimForTesting();
+                mBookmarkBridge.loadEmptyPartnerBookmarkShimForTesting();
             }
         });
         setUpTestAccountAndSignInToSync();
@@ -366,8 +366,8 @@ public class BookmarksTest extends SyncTestBase {
         BookmarkId id = ThreadUtils.runOnUiThreadBlockingNoException(new Callable<BookmarkId>() {
             @Override
             public BookmarkId call() throws Exception {
-                BookmarkId parentId = mBookmarksBridge.getMobileFolderId();
-                return mBookmarksBridge.addBookmark(parentId, 0, title, url);
+                BookmarkId parentId = mBookmarkBridge.getMobileFolderId();
+                return mBookmarkBridge.addBookmark(parentId, 0, title, url);
             }
         });
         assertNotNull("Failed to create bookmark.", id);
@@ -378,8 +378,8 @@ public class BookmarksTest extends SyncTestBase {
         BookmarkId id = ThreadUtils.runOnUiThreadBlockingNoException(new Callable<BookmarkId>() {
             @Override
             public BookmarkId call() throws Exception {
-                BookmarkId parentId = mBookmarksBridge.getMobileFolderId();
-                return mBookmarksBridge.addFolder(parentId, 0, title);
+                BookmarkId parentId = mBookmarkBridge.getMobileFolderId();
+                return mBookmarkBridge.addFolder(parentId, 0, title);
             }
         });
         assertNotNull("Failed to create bookmark folder.", id);
@@ -410,7 +410,7 @@ public class BookmarksTest extends SyncTestBase {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                mBookmarksBridge.deleteBookmark(id);
+                mBookmarkBridge.deleteBookmark(id);
             }
         });
     }
@@ -419,7 +419,7 @@ public class BookmarksTest extends SyncTestBase {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                mBookmarksBridge.setBookmarkTitle(id, title);
+                mBookmarkBridge.setBookmarkTitle(id, title);
             }
         });
     }
@@ -428,7 +428,7 @@ public class BookmarksTest extends SyncTestBase {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                mBookmarksBridge.moveBookmark(id, newParentId, 0 /* new index */);
+                mBookmarkBridge.moveBookmark(id, newParentId, 0 /* new index */);
             }
         });
     }