Move BookmarksBridge into package with other bookmarks classes.

chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java

Index: chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
index 26120fa48166dc1350a078873fbbdb780d2d7bd0..1d501a97946676c21630a9b494b62497e0f8dd30 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
@@ -13,7 +13,7 @@ import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeBrowserProviderClient;
 import org.chromium.chrome.browser.ShortcutHelper;
 import org.chromium.chrome.browser.UrlConstants;
-import org.chromium.chrome.browser.bookmark.BookmarksBridge;
+import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
 import org.chromium.chrome.browser.offlinepages.OfflinePageUtils;
 import org.chromium.chrome.browser.omaha.UpdateMenuItemHelper;
 import org.chromium.chrome.browser.preferences.ManagedPreferencesUtils;
@@ -38,7 +38,7 @@ public class AppMenuPropertiesDelegate {
 
     protected final ChromeActivity mActivity;
 
-    protected BookmarksBridge mBookmarksBridge;
+    protected BookmarkBridge mBookmarkBridge;
 
     public AppMenuPropertiesDelegate(ChromeActivity activity) {
         mActivity = activity;
@@ -99,7 +99,7 @@ public class AppMenuPropertiesDelegate {
                 loadingStateChanged(currentTab.isLoading());
 
                 MenuItem bookmarkMenuItem = menu.findItem(R.id.bookmark_this_page_id);
-                bookmarkMenuItem.setEnabled(mBookmarksBridge.isEditBookmarksEnabled());
+                bookmarkMenuItem.setEnabled(mBookmarkBridge.isEditBookmarksEnabled());
                 if (currentTab.getBookmarkId() != ChromeBrowserProviderClient.INVALID_BOOKMARK_ID) {
                     bookmarkMenuItem.setIcon(R.drawable.btn_star_filled);
                     bookmarkMenuItem.setChecked(true);
@@ -244,9 +244,9 @@ public class AppMenuPropertiesDelegate {
     /**
      * Updates the bookmarks bridge.
      *
-     * @param bookmarksBridge The bookmarks bridge.
+     * @param bookmarkBridge The bookmarks bridge.
      */
-    public void setBookmarksBridge(BookmarksBridge bookmarksBridge) {
-        mBookmarksBridge = bookmarksBridge;
+    public void setBookmarkBridge(BookmarkBridge bookmarkBridge) {
+        mBookmarkBridge = bookmarkBridge;
     }
 }