bookmarks: Move BookmarkNode into 'bookmarks' namespace.

components/enhanced_bookmarks/bookmark_server_cluster_service.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_BOOKMARK_SERVER_CLUSTER_SERVICE_H_
 #define COMPONENTS_ENHANCED_BOOKMARKS_BOOKMARK_SERVER_CLUSTER_SERVICE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 25 matching lines @@
       scoped_refptr<net::URLRequestContextGetter> request_context_getter,
       ProfileOAuth2TokenService* token_service,
       SigninManagerBase* signin_manager,
       EnhancedBookmarkModel* enhanced_bookmark_model,
       PrefService* pref_service);
   ~BookmarkServerClusterService() override;
 
   // Retrieves all the bookmarks associated with a cluster. The returned
   // BookmarkNodes are owned by the bookmark model, and one must listen to the
   // model observer notification to clear them.
-  const std::vector<const BookmarkNode*> BookmarksForClusterNamed(
+  const std::vector<const bookmarks::BookmarkNode*> BookmarksForClusterNamed(
       const std::string& cluster_name) const;
 
   // Returns the clusters in which the passed bookmark is in, if any.
   const std::vector<std::string> ClustersForBookmark(
-      const BookmarkNode* bookmark) const;
+      const bookmarks::BookmarkNode* bookmark) const;
 
   // Dynamically generates a vector of all clusters names.
   const std::vector<std::string> GetClusters() const;
 
   // Registers server cluster service prefs.
   static void RegisterPrefs(user_prefs::PrefRegistrySyncable* registry);
 
  protected:
   // BookmarkServerService methods.
   scoped_ptr<net::URLFetcher> CreateFetcher() override;
   bool ProcessResponse(const std::string& response,
                        bool* should_notify) override;
   void CleanAfterFailure() override;
 
   // EnhancedBookmarkModelObserver methods.
   void EnhancedBookmarkModelLoaded() override;
-  void EnhancedBookmarkAdded(const BookmarkNode* node) override;
-  void EnhancedBookmarkRemoved(const BookmarkNode* node) override;
-  void EnhancedBookmarkNodeChanged(const BookmarkNode* node) override;
+  void EnhancedBookmarkAdded(const bookmarks::BookmarkNode* node) override;
+  void EnhancedBookmarkRemoved(const bookmarks::BookmarkNode* node) override;
+  void EnhancedBookmarkNodeChanged(
+      const bookmarks::BookmarkNode* node) override;
   void EnhancedBookmarkAllUserNodesRemoved() override;
-  void EnhancedBookmarkRemoteIdChanged(const BookmarkNode* node,
+  void EnhancedBookmarkRemoteIdChanged(const bookmarks::BookmarkNode* node,
                                        const std::string& old_remote_id,
                                        const std::string& remote_id) override;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(BookmarkServerServiceTest, Cluster);
   FRIEND_TEST_ALL_PREFIXES(BookmarkServerServiceTest, SignOut);
   FRIEND_TEST_ALL_PREFIXES(BookmarkServerServiceTest, Serialization);
   FRIEND_TEST_ALL_PREFIXES(BookmarkServerServiceTest, SaveToPrefs);
   FRIEND_TEST_ALL_PREFIXES(BookmarkServerServiceTest, BadAuth);
   FRIEND_TEST_ALL_PREFIXES(BookmarkServerServiceTest, EmptyAuth);
@@ skipping 33 matching lines @@
   PrefService* pref_service_;
   // The cluster data, a map from cluster name to a vector of stars.id.
   ClusterMap cluster_data_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkServerClusterService);
 };
 
 }  // namespace enhanced_bookmarks
 
 #endif  // COMPONENTS_ENHANCED_BOOKMARKS_BOOKMARK_SERVER_CLUSTER_SERVICE_H_