bookmarks: Move BaseBookmarkModelObserver into 'bookmarks' namespace.

components/enhanced_bookmarks/enhanced_bookmark_model.h

 // Copyright 2014 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 COMPONENTS_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARK_MODEL_H_
 #define COMPONENTS_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARK_MODEL_H_
 
 #include <map>
 #include <string>
 
@@ skipping 16 matching lines @@
 
 FORWARD_DECLARE_TEST(EnhancedBookmarkModelTest, SetMultipleMetaInfo);
 
 namespace enhanced_bookmarks {
 
 class EnhancedBookmarkModelObserver;
 
 // Wrapper around BookmarkModel providing utility functions for enhanced
 // bookmarks.
 class EnhancedBookmarkModel : public KeyedService,
-                              public BaseBookmarkModelObserver {
+                              public bookmarks::BaseBookmarkModelObserver {
  public:
   EnhancedBookmarkModel(BookmarkModel* bookmark_model,
                         const std::string& version);
   ~EnhancedBookmarkModel() override;
 
   void Shutdown() override;
 
   void AddObserver(EnhancedBookmarkModelObserver* observer);
   void RemoveObserver(EnhancedBookmarkModelObserver* observer);
 
@@ skipping 83 matching lines @@
 
   // Returns the version string to use when setting stars.version.
   std::string GetVersionString();
 
  private:
   FRIEND_TEST_ALL_PREFIXES(::EnhancedBookmarkModelTest, SetMultipleMetaInfo);
 
   typedef std::map<std::string, const BookmarkNode*> IdToNodeMap;
   typedef std::map<const BookmarkNode*, std::string> NodeToIdMap;
 
-  // BaseBookmarkModelObserver:
+  // bookmarks::BaseBookmarkModelObserver:
   void BookmarkModelChanged() override;
   void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override;
   void BookmarkNodeAdded(BookmarkModel* model,
                          const BookmarkNode* parent,
                          int index) override;
   void BookmarkNodeRemoved(BookmarkModel* model,
                            const BookmarkNode* parent,
                            int old_index,
                            const BookmarkNode* node,
                            const std::set<GURL>& removed_urls) override;
@@ skipping 53 matching lines @@
 
   std::string version_;
   std::string version_suffix_;
 
   base::WeakPtrFactory<EnhancedBookmarkModel> weak_ptr_factory_;
 };
 
 }  // namespace enhanced_bookmarks
 
 #endif  // COMPONENTS_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARK_MODEL_H_