Move BookmarksBridge into package with other bookmarks classes.

chrome/browser/android/bookmarks/bookmark_bridge.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_ANDROID_BOOKMARKS_BOOKMARKS_BRIDGE_H_
-#define CHROME_BROWSER_ANDROID_BOOKMARKS_BOOKMARKS_BRIDGE_H_
+#ifndef CHROME_BROWSER_ANDROID_BOOKMARKS_BOOKMARK_BRIDGE_H_
+#define CHROME_BROWSER_ANDROID_BOOKMARKS_BOOKMARK_BRIDGE_H_
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_weak_ref.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
 #include "components/bookmarks/browser/base_bookmark_model_observer.h"
 #include "components/bookmarks/common/android/bookmark_id.h"
 #include "components/prefs/pref_change_registrar.h"
 
 namespace bookmarks {
 class BookmarkModel;
 class ManagedBookmarkService;
 class ScopedGroupBookmarkActions;
 }
 
 class Profile;
 
 // The delegate to fetch bookmarks information for the Android native
 // bookmark page. This fetches the bookmarks, title, urls, folder
 // hierarchy.
-class BookmarksBridge : public bookmarks::BaseBookmarkModelObserver,
+class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
                         public PartnerBookmarksShim::Observer {
  public:
-  BookmarksBridge(JNIEnv* env, jobject obj, jobject j_profile);
+  BookmarkBridge(JNIEnv* env, jobject obj, jobject j_profile);
   void Destroy(JNIEnv*, const base::android::JavaParamRef<jobject>&);
 
-  static bool RegisterBookmarksBridge(JNIEnv* env);
+  static bool RegisterBookmarkBridge(JNIEnv* env);
 
   bool IsDoingExtensiveChanges(JNIEnv* env,
                                const base::android::JavaParamRef<jobject>& obj);
 
   jboolean IsEditBookmarksEnabled(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj);
 
   void LoadEmptyPartnerBookmarkShimForTesting(
       JNIEnv* env,
@@ skipping 141 matching lines @@
 
   void StartGroupingUndos(JNIEnv* env,
                           const base::android::JavaParamRef<jobject>& obj);
 
   void EndGroupingUndos(JNIEnv* env,
                         const base::android::JavaParamRef<jobject>& obj);
 
   base::string16 GetTitle(const bookmarks::BookmarkNode* node) const;
 
  private:
-  ~BookmarksBridge() override;
+  ~BookmarkBridge() override;
 
   base::android::ScopedJavaLocalRef<jobject> CreateJavaBookmark(
       const bookmarks::BookmarkNode* node);
   void ExtractBookmarkNodeInformation(const bookmarks::BookmarkNode* node,
                                       jobject j_result_obj);
   const bookmarks::BookmarkNode* GetNodeByID(long node_id, int type);
   const bookmarks::BookmarkNode* GetFolderWithFallback(long folder_id,
                                                        int type);
   bool IsEditBookmarksEnabled() const;
   void EditBookmarksEnabledChanged();
@@ skipping 50 matching lines @@
   JavaObjectWeakGlobalRef weak_java_ref_;
   bookmarks::BookmarkModel* bookmark_model_;  // weak
   bookmarks::ManagedBookmarkService* managed_bookmark_service_;  // weak
   scoped_ptr<bookmarks::ScopedGroupBookmarkActions> grouped_bookmark_actions_;
   PrefChangeRegistrar pref_change_registrar_;
 
   // Information about the Partner bookmarks (must check for IsLoaded()).
   // This is owned by profile.
   PartnerBookmarksShim* partner_bookmarks_shim_;
 
-  DISALLOW_COPY_AND_ASSIGN(BookmarksBridge);
+  DISALLOW_COPY_AND_ASSIGN(BookmarkBridge);
 };
 
-#endif  // CHROME_BROWSER_ANDROID_BOOKMARKS_BOOKMARKS_BRIDGE_H_
+#endif  // CHROME_BROWSER_ANDROID_BOOKMARKS_BOOKMARK_BRIDGE_H_