bookmarks: Move BookmarkNode into 'bookmarks' namespace.

chrome/browser/sync/test/integration/bookmarks_helper.h

Index: chrome/browser/sync/test/integration/bookmarks_helper.h
diff --git a/chrome/browser/sync/test/integration/bookmarks_helper.h b/chrome/browser/sync/test/integration/bookmarks_helper.h
index 7968d9b919403f7152bc0923870ea6d7855c534d..a22976048822bb281a2637346481d504d9ce992f 100644
--- a/chrome/browser/sync/test/integration/bookmarks_helper.h
+++ b/chrome/browser/sync/test/integration/bookmarks_helper.h
@@ -5,90 +5,91 @@
 #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_BOOKMARKS_HELPER_H_
 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_BOOKMARKS_HELPER_H_
 
-#include <set>
 #include <string>
-#include <vector>
 
 #include "base/compiler_specific.h"
-#include "components/bookmarks/browser/bookmark_model.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/skia/include/core/SkBitmap.h"
-#include "url/gurl.h"
+#include "third_party/skia/include/core/SkColor.h"
 
 class GURL;
 
+namespace bookmarks {
+class BookmarkModel;
+class BookmarkNode;
+}
+
+namespace gfx {
+class Image;
+}
+
 namespace bookmarks_helper {
 
 // Used to access the bookmark model within a particular sync profile.
 bookmarks::BookmarkModel* GetBookmarkModel(int index) WARN_UNUSED_RESULT;
 
 // Used to access the bookmark bar within a particular sync profile.
-const BookmarkNode* GetBookmarkBarNode(int index) WARN_UNUSED_RESULT;
+const bookmarks::BookmarkNode* GetBookmarkBarNode(int index) WARN_UNUSED_RESULT;
 
 // Used to access the "other bookmarks" node within a particular sync profile.
-const BookmarkNode* GetOtherNode(int index) WARN_UNUSED_RESULT;
+const bookmarks::BookmarkNode* GetOtherNode(int index) WARN_UNUSED_RESULT;
 
 // Used to access the "Synced Bookmarks" node within a particular sync profile.
-const BookmarkNode* GetSyncedBookmarksNode(int index) WARN_UNUSED_RESULT;
+const bookmarks::BookmarkNode* GetSyncedBookmarksNode(int index)
+    WARN_UNUSED_RESULT;
 
 // Used to access the "Managed Bookmarks" node for the given profile.
-const BookmarkNode* GetManagedNode(int index) WARN_UNUSED_RESULT;
+const bookmarks::BookmarkNode* GetManagedNode(int index) WARN_UNUSED_RESULT;
 
 // Used to access the bookmarks within the verifier sync profile.
 bookmarks::BookmarkModel* GetVerifierBookmarkModel() WARN_UNUSED_RESULT;
 
 // Adds a URL with address |url| and title |title| to the bookmark bar of
 // profile |profile|. Returns a pointer to the node that was added.
-const BookmarkNode* AddURL(
-    int profile,
-    const std::string& title,
-    const GURL& url) WARN_UNUSED_RESULT;
+const bookmarks::BookmarkNode* AddURL(int profile,
+                                      const std::string& title,
+                                      const GURL& url) WARN_UNUSED_RESULT;
 
 // Adds a URL with address |url| and title |title| to the bookmark bar of
 // profile |profile| at position |index|. Returns a pointer to the node that
 // was added.
-const BookmarkNode* AddURL(
-    int profile,
-    int index,
-    const std::string& title,
-    const GURL& url) WARN_UNUSED_RESULT;
+const bookmarks::BookmarkNode* AddURL(int profile,
+                                      int index,
+                                      const std::string& title,
+                                      const GURL& url) WARN_UNUSED_RESULT;
 
 // Adds a URL with address |url| and title |title| under the node |parent| of
 // profile |profile| at position |index|. Returns a pointer to the node that
 // was added.
-const BookmarkNode* AddURL(
-    int profile,
-    const BookmarkNode* parent,
-    int index,
-    const std::string& title,
-    const GURL& url) WARN_UNUSED_RESULT;
+const bookmarks::BookmarkNode* AddURL(int profile,
+                                      const bookmarks::BookmarkNode* parent,
+                                      int index,
+                                      const std::string& title,
+                                      const GURL& url) WARN_UNUSED_RESULT;
 
 // Adds a folder named |title| to the bookmark bar of profile |profile|.
 // Returns a pointer to the folder that was added.
-const BookmarkNode* AddFolder(
-    int profile,
-    const std::string& title) WARN_UNUSED_RESULT;
+const bookmarks::BookmarkNode* AddFolder(int profile, const std::string& title)
+    WARN_UNUSED_RESULT;
 
 // Adds a folder named |title| to the bookmark bar of profile |profile| at
 // position |index|. Returns a pointer to the folder that was added.
-const BookmarkNode* AddFolder(
-    int profile,
-    int index,
-    const std::string& title) WARN_UNUSED_RESULT;
+const bookmarks::BookmarkNode* AddFolder(int profile,
+                                         int index,
+                                         const std::string& title)
+    WARN_UNUSED_RESULT;
 
 // Adds a folder named |title| to the node |parent| in the bookmark model of
 // profile |profile| at position |index|. Returns a pointer to the node that
 // was added.
-const BookmarkNode* AddFolder(
-    int profile,
-    const BookmarkNode* parent,
-    int index,
-    const std::string& title) WARN_UNUSED_RESULT;
+const bookmarks::BookmarkNode* AddFolder(int profile,
+                                         const bookmarks::BookmarkNode* parent,
+                                         int index,
+                                         const std::string& title)
+    WARN_UNUSED_RESULT;
 
 // Changes the title of the node |node| in the bookmark model of profile
 // |profile| to |new_title|.
 void SetTitle(int profile,
-              const BookmarkNode* node,
+              const bookmarks::BookmarkNode* node,
               const std::string& new_title);
 
 // The source of the favicon.
@@ -100,40 +101,38 @@ enum FaviconSource {
 // Sets the |icon_url| and |image| data for the favicon for |node| in the
 // bookmark model for |profile|.
 void SetFavicon(int profile,
-                const BookmarkNode* node,
+                const bookmarks::BookmarkNode* node,
                 const GURL& icon_url,
                 const gfx::Image& image,
                 FaviconSource source);
 
 // Changes the url of the node |node| in the bookmark model of profile
 // |profile| to |new_url|. Returns a pointer to the node with the changed url.
-const BookmarkNode* SetURL(
-    int profile,
-    const BookmarkNode* node,
-    const GURL& new_url) WARN_UNUSED_RESULT;
+const bookmarks::BookmarkNode* SetURL(int profile,
+                                      const bookmarks::BookmarkNode* node,
+                                      const GURL& new_url) WARN_UNUSED_RESULT;
 
 // Moves the node |node| in the bookmark model of profile |profile| so it ends
 // up under the node |new_parent| at position |index|.
-void Move(
-    int profile,
-    const BookmarkNode* node,
-    const BookmarkNode* new_parent,
-    int index);
+void Move(int profile,
+          const bookmarks::BookmarkNode* node,
+          const bookmarks::BookmarkNode* new_parent,
+          int index);
 
 // Removes the node in the bookmark model of profile |profile| under the node
 // |parent| at position |index|.
-void Remove(int profile, const BookmarkNode* parent, int index);
+void Remove(int profile, const bookmarks::BookmarkNode* parent, int index);
 
 // Removes all non-permanent nodes in the bookmark model of profile |profile|.
 void RemoveAll(int profile);
 
 // Sorts the children of the node |parent| in the bookmark model of profile
 // |profile|.
-void SortChildren(int profile, const BookmarkNode* parent);
+void SortChildren(int profile, const bookmarks::BookmarkNode* parent);
 
 // Reverses the order of the children of the node |parent| in the bookmark
 // model of profile |profile|.
-void ReverseChildOrder(int profile, const BookmarkNode* parent);
+void ReverseChildOrder(int profile, const bookmarks::BookmarkNode* parent);
 
 // Checks if the bookmark model of profile |profile| matches the verifier
 // bookmark model. Returns true if they match.
@@ -167,9 +166,8 @@ bool HasNodeWithURL(int profile, const GURL& url);
 
 // Gets the node in the bookmark model of profile |profile| that has the url
 // |url|. Note: Only one instance of |url| is assumed to be present.
-const BookmarkNode* GetUniqueNodeByURL(
-    int profile,
-    const GURL& url) WARN_UNUSED_RESULT;
+const bookmarks::BookmarkNode* GetUniqueNodeByURL(int profile, const GURL& url)
+    WARN_UNUSED_RESULT;
 
 // Returns the number of bookmarks in bookmark model of profile |profile|.
 int CountAllBookmarks(int profile) WARN_UNUSED_RESULT;