bookmarks: Move BaseBookmarkModelObserver into 'bookmarks' namespace.

chrome/browser/android/provider/chrome_browser_provider.h

 // Copyright (c) 2012 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_PROVIDER_CHROME_BROWSER_PROVIDER_H_
 #define CHROME_BROWSER_ANDROID_PROVIDER_CHROME_BROWSER_PROVIDER_H_
 
 #include "base/android/jni_weak_ref.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 12 matching lines @@
 
 namespace history {
 class TopSites;
 }
 
 namespace sql {
 class Statement;
 }
 
 // This class implements the native methods of ChromeBrowserProvider.java
-class ChromeBrowserProvider : public BaseBookmarkModelObserver,
+class ChromeBrowserProvider : public bookmarks::BaseBookmarkModelObserver,
                               public content::NotificationObserver,
                               public history::HistoryServiceObserver {
  public:
   ChromeBrowserProvider(JNIEnv* env, jobject obj);
   void Destroy(JNIEnv*, jobject);
 
   // JNI registration.
   static bool RegisterChromeBrowserProvider(JNIEnv* env);
 
   // Adds either a new bookmark or bookmark folder based on |is_folder|.  The
@@ skipping 126 matching lines @@
       jobject obj,
       jstring url);
 
   base::android::ScopedJavaLocalRef<jbyteArray> GetThumbnail(JNIEnv* env,
                                                              jobject obj,
                                                              jstring url);
 
  private:
   virtual ~ChromeBrowserProvider();
 
-  // Override BaseBookmarkModelObserver.
+  // Override bookmarks::BaseBookmarkModelObserver.
   virtual void BookmarkModelChanged() override;
   virtual void ExtensiveBookmarkChangesBeginning(BookmarkModel* model) override;
   virtual void ExtensiveBookmarkChangesEnded(BookmarkModel* model) override;
 
   // Deals with updates to the history service.
   void OnHistoryChanged();
 
-  // Override HistoryServiceObserver.
+  // Override history::HistoryServiceObserver.
   virtual void OnURLVisited(HistoryService* history_service,
                             ui::PageTransition transition,
                             const history::URLRow& row,
                             const history::RedirectList& redirects,
                             base::Time visit_time) override;
 
-  // Override NotificationObserver.
+  // Override content::NotificationObserver.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) override;
 
   JavaObjectWeakGlobalRef weak_java_provider_;
 
   // Profile must outlive this object.
   //
   // BookmarkModel, HistoryService and history::TopSites lifetime is bound to
   // the lifetime of Profile, they are safe to use as long as the Profile is
@@ skipping 10 matching lines @@
   content::NotificationRegistrar notification_registrar_;
   ScopedObserver<HistoryService, HistoryServiceObserver>
       history_service_observer_;
 
   bool handling_extensive_changes_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeBrowserProvider);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_PROVIDER_CHROME_BROWSER_PROVIDER_H_