bookmarks: Move BookmarkNode into 'bookmarks' namespace.

components/enhanced_bookmarks/bookmark_server_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_SERVICE_H_
 #define COMPONENTS_ENHANCED_BOOKMARKS_BOOKMARK_SERVER_SERVICE_H_
 
 #include <string>
 #include <vector>
 
 #include "components/enhanced_bookmarks/enhanced_bookmark_model_observer.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_context_getter.h"
 
 class ProfileOAuth2TokenService;
 class SigninManagerBase;
+
+namespace bookmarks {
 class BookmarkNode;
+}
 
 namespace enhanced_bookmarks {
 
 class BookmarkServerService;
 class EnhancedBookmarkModel;
 
 class BookmarkServerServiceObserver {
  public:
   virtual void OnChange(BookmarkServerService* service) = 0;
 
@@ skipping 15 matching lines @@
       SigninManagerBase* signin_manager,
       EnhancedBookmarkModel* enhanced_bookmark_model);
   ~BookmarkServerService() override;
 
   virtual void AddObserver(BookmarkServerServiceObserver* observer);
   void RemoveObserver(BookmarkServerServiceObserver* observer);
 
  protected:
   // Retrieves a bookmark by using its remote id. Returns null if nothing
   // matches.
-  virtual const BookmarkNode* BookmarkForRemoteId(
+  virtual const bookmarks::BookmarkNode* BookmarkForRemoteId(
       const std::string& remote_id) const;
-  const std::string RemoteIDForBookmark(const BookmarkNode* bookmark) const;
+  const std::string RemoteIDForBookmark(
+      const bookmarks::BookmarkNode* bookmark) const;
 
   // Cancels the ongoing request, if any.
   void Cancel();
 
   // Notifies the observers that something changed.
   void Notify();
 
   // Triggers a fetch.
   void TriggerTokenRequest(bool cancel_previous);
 
@@ skipping 46 matching lines @@
   SigninManagerBase* signin_manager_;  // Weak
   // To have access to the right context getter for the profile.
   scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
   // The fetcher used to query the server.
   scoped_ptr<net::URLFetcher> url_fetcher_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkServerService);
 };
 }  // namespace enhanced_bookmarks
 
-#endif  // COMPONENTS_ENHANCED_BOOKMARKS_BOOKMARK_SERVER_SERVICE_H_
+#endif  // COMPONENTS_ENHANCED_BOOKMARKS_BOOKMARK_SERVER_SERVICE_H_/home/tfarina/chromium/src/buildtools/linux64/clang-format

[sky, 2015/02/03 17:08:37]

Fix this one too.

[tfarina, 2015/02/04 20:51:14]

Done.

+