Move BookmarkNodeData into bookmarks namespace.

BUG=370433
TEST=None
R=sky@chromium.org

Review URL: https://codereview.chromium.org/422673002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286404 0039d316-1c4b-4281-b951-d872f2087c98

14 files changed, 37 insertions, 12 deletions

diff --git a/components/bookmarks/browser/bookmark_client.h b/components/bookmarks/browser/bookmark_client.h
index ea57ed7..d4142b1 100644
--- a/components/bookmarks/browser/bookmark_client.h
+++ b/components/bookmarks/browser/bookmark_client.h
@@ -73,7 +73,7 @@ class BookmarkClient : public KeyedService {
 
   // Returns a task that will be used to load any additional root nodes. This
   // task will be invoked in the Profile's IO task runner.
-  virtual bookmarks::LoadExtraCallback GetLoadExtraNodesCallback() = 0;
+  virtual LoadExtraCallback GetLoadExtraNodesCallback() = 0;
 
   // Returns true if the |permanent_node| can have its title updated.
   virtual bool CanSetPermanentNodeTitle(const BookmarkNode* permanent_node) = 0;
diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmarks/browser/bookmark_model.cc
index c0a059f..5f26f67 100644
--- a/components/bookmarks/browser/bookmark_model.cc
+++ b/components/bookmarks/browser/bookmark_model.cc
@@ -31,6 +31,7 @@ using bookmarks::BookmarkExpandedStateTracker;
 using bookmarks::BookmarkIndex;
 using bookmarks::BookmarkLoadDetails;
 using bookmarks::BookmarkMatch;
+using bookmarks::BookmarkNodeData;
 using bookmarks::BookmarkStorage;
 
 namespace {
diff --git a/components/bookmarks/browser/bookmark_node_data.cc b/components/bookmarks/browser/bookmark_node_data.cc
index 365c1ea..ad2ad42 100644
--- a/components/bookmarks/browser/bookmark_node_data.cc
+++ b/components/bookmarks/browser/bookmark_node_data.cc
@@ -13,6 +13,8 @@
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 
+namespace bookmarks {
+
 const char* BookmarkNodeData::kClipboardFormatString =
     "chromium/x-bookmark-entries";
 
@@ -251,8 +253,7 @@ std::vector<const BookmarkNode*> BookmarkNodeData::GetNodes(
     return nodes;
 
   for (size_t i = 0; i < elements.size(); ++i) {
-    const BookmarkNode* node =
-        bookmarks::GetBookmarkNodeByID(model, elements[i].id_);
+    const BookmarkNode* node = GetBookmarkNodeByID(model, elements[i].id_);
     if (!node) {
       nodes.clear();
       return nodes;
@@ -285,3 +286,5 @@ bool BookmarkNodeData::IsFromProfilePath(
   // An empty path means the data is not associated with any profile.
   return !profile_path_.empty() && profile_path_ == profile_path;
 }
+
+}  // namespace bookmarks
diff --git a/components/bookmarks/browser/bookmark_node_data.h b/components/bookmarks/browser/bookmark_node_data.h
index 9fdf975..c44594e1 100644
--- a/components/bookmarks/browser/bookmark_node_data.h
+++ b/components/bookmarks/browser/bookmark_node_data.h
@@ -22,6 +22,8 @@ class BookmarkModel;
 class Pickle;
 class PickleIterator;
 
+namespace bookmarks {
+
 // BookmarkNodeData is used to represent the following:
 //
 // . A single URL.
@@ -171,4 +173,6 @@ struct BookmarkNodeData {
   base::FilePath profile_path_;
 };
 
+}  // namespace bookmarks
+
 #endif  // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_NODE_DATA_H_
diff --git a/components/bookmarks/browser/bookmark_node_data_ios.cc b/components/bookmarks/browser/bookmark_node_data_ios.cc
index cbf6e8d..44c45cb 100644
--- a/components/bookmarks/browser/bookmark_node_data_ios.cc
+++ b/components/bookmarks/browser/bookmark_node_data_ios.cc
@@ -6,6 +6,8 @@
 
 #include "base/logging.h"
 
+namespace bookmarks {
+
 // static
 bool BookmarkNodeData::ClipboardContainsBookmarks() {
   NOTREACHED();
@@ -20,3 +22,5 @@ bool BookmarkNodeData::ReadFromClipboard(ui::ClipboardType type) {
   NOTREACHED();
   return false;
 }
+
+}  // namespace bookmarks
diff --git a/components/bookmarks/browser/bookmark_node_data_mac.cc b/components/bookmarks/browser/bookmark_node_data_mac.cc
index 1523885..2dde55e 100644
--- a/components/bookmarks/browser/bookmark_node_data_mac.cc
+++ b/components/bookmarks/browser/bookmark_node_data_mac.cc
@@ -6,6 +6,8 @@
 
 #include "components/bookmarks/browser/bookmark_pasteboard_helper_mac.h"
 
+namespace bookmarks {
+
 // static
 bool BookmarkNodeData::ClipboardContainsBookmarks() {
   return PasteboardContainsBookmarks(ui::CLIPBOARD_TYPE_COPY_PASTE);
@@ -24,3 +26,5 @@ bool BookmarkNodeData::ReadFromClipboard(ui::ClipboardType type) {
 
   return false;
 }
+
+}  // namespace bookmarks
diff --git a/components/bookmarks/browser/bookmark_node_data_unittest.cc b/components/bookmarks/browser/bookmark_node_data_unittest.cc
index bda1047..9a0ecd7 100644
--- a/components/bookmarks/browser/bookmark_node_data_unittest.cc
+++ b/components/bookmarks/browser/bookmark_node_data_unittest.cc
@@ -18,6 +18,8 @@
 
 using base::ASCIIToUTF16;
 
+namespace bookmarks {
+
 class BookmarkNodeDataTest : public testing::Test {
  public:
   BookmarkNodeDataTest() {}
@@ -294,3 +296,5 @@ TEST_F(BookmarkNodeDataTest, MetaInfo) {
   EXPECT_EQ("somevalue", meta_info_map["somekey"]);
   EXPECT_EQ("someothervalue", meta_info_map["someotherkey"]);
 }
+
+}  // namespace bookmarks
diff --git a/components/bookmarks/browser/bookmark_node_data_views.cc b/components/bookmarks/browser/bookmark_node_data_views.cc
index b34116a..888ffcc 100644
--- a/components/bookmarks/browser/bookmark_node_data_views.cc
+++ b/components/bookmarks/browser/bookmark_node_data_views.cc
@@ -9,6 +9,8 @@
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/clipboard/clipboard.h"
 
+namespace bookmarks {
+
 namespace {
 
 const char kJavaScriptScheme[] = "javascript";
@@ -69,3 +71,5 @@ bool BookmarkNodeData::Read(const ui::OSExchangeData& data) {
 
   return is_valid();
 }
+
+}  // namespace bookmarks
diff --git a/components/bookmarks/browser/bookmark_pasteboard_helper_mac.h b/components/bookmarks/browser/bookmark_pasteboard_helper_mac.h
index aecb727..a382258 100644
--- a/components/bookmarks/browser/bookmark_pasteboard_helper_mac.h
+++ b/components/bookmarks/browser/bookmark_pasteboard_helper_mac.h
@@ -21,13 +21,13 @@ class FilePath;
 // Writes a set of bookmark elements from a profile to the specified pasteboard.
 void WriteBookmarksToPasteboard(
     ui::ClipboardType type,
-    const std::vector<BookmarkNodeData::Element>& elements,
+    const std::vector<bookmarks::BookmarkNodeData::Element>& elements,
     const base::FilePath& profile_path);
 
 // Reads a set of bookmark elements from the specified pasteboard.
 bool ReadBookmarksFromPasteboard(
     ui::ClipboardType type,
-    std::vector<BookmarkNodeData::Element>& elements,
+    std::vector<bookmarks::BookmarkNodeData::Element>& elements,
     base::FilePath* profile_path);
 
 // Returns true if the specified pasteboard contains any sort of bookmark
diff --git a/components/bookmarks/browser/bookmark_pasteboard_helper_mac.mm b/components/bookmarks/browser/bookmark_pasteboard_helper_mac.mm
index 845929a..eec2540 100644
--- a/components/bookmarks/browser/bookmark_pasteboard_helper_mac.mm
+++ b/components/bookmarks/browser/bookmark_pasteboard_helper_mac.mm
@@ -11,6 +11,8 @@
 #include "components/bookmarks/browser/bookmark_node.h"
 #include "ui/base/clipboard/clipboard.h"
 
+using bookmarks::BookmarkNodeData;
+
 NSString* const kBookmarkDictionaryListPboardType =
     @"BookmarkDictionaryListPboardType";
 
diff --git a/components/bookmarks/browser/bookmark_storage.cc b/components/bookmarks/browser/bookmark_storage.cc
index 50e0669..0ad059d 100644
--- a/components/bookmarks/browser/bookmark_storage.cc
+++ b/components/bookmarks/browser/bookmark_storage.cc
@@ -146,8 +146,7 @@ BookmarkStorage::BookmarkStorage(
     const base::FilePath& profile_path,
     base::SequencedTaskRunner* sequenced_task_runner)
     : model_(model),
-      writer_(profile_path.Append(bookmarks::kBookmarksFileName),
-              sequenced_task_runner),
+      writer_(profile_path.Append(kBookmarksFileName), sequenced_task_runner),
       weak_factory_(this) {
   sequenced_task_runner_ = sequenced_task_runner;
   writer_.set_commit_interval(base::TimeDelta::FromMilliseconds(kSaveDelayMS));
diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmarks/browser/bookmark_utils.cc
index 03a56cc..304d2be 100644
--- a/components/bookmarks/browser/bookmark_utils.cc
+++ b/components/bookmarks/browser/bookmark_utils.cc
@@ -179,7 +179,7 @@ void CopyToClipboard(BookmarkModel* model,
       WriteToClipboard(ui::CLIPBOARD_TYPE_COPY_PASTE);
 
   if (remove_nodes) {
-    bookmarks::ScopedGroupBookmarkActions group_cut(model);
+    ScopedGroupBookmarkActions group_cut(model);
     for (size_t i = 0; i < filtered_nodes.size(); ++i) {
       int index = filtered_nodes[i]->parent()->GetIndexOf(filtered_nodes[i]);
       if (index > -1)
@@ -200,7 +200,7 @@ void PasteFromClipboard(BookmarkModel* model,
 
   if (index == -1)
     index = parent->child_count();
-  bookmarks::ScopedGroupBookmarkActions group_paste(model);
+  ScopedGroupBookmarkActions group_paste(model);
   CloneBookmarkNode(model, bookmark_data.elements, parent, index, true);
 }
 
diff --git a/components/bookmarks/browser/bookmark_utils.h b/components/bookmarks/browser/bookmark_utils.h
index 32dfbe8..9fcbfb5 100644
--- a/components/bookmarks/browser/bookmark_utils.h
+++ b/components/bookmarks/browser/bookmark_utils.h
@@ -140,7 +140,7 @@ base::string16 CleanUpTitleForMatching(const base::string16& title);
 
 // Returns true if all the |nodes| can be edited by the user,
 // as determined by BookmarkClient::CanBeEditedByUser().
-bool CanAllBeEditedByUser(bookmarks::BookmarkClient* client,
+bool CanAllBeEditedByUser(BookmarkClient* client,
                           const std::vector<const BookmarkNode*>& nodes);
 
 // Returns true if |url| has a bookmark in the |model| that can be edited
diff --git a/components/bookmarks/browser/bookmark_utils_unittest.cc b/components/bookmarks/browser/bookmark_utils_unittest.cc
index fd3d472..6445373 100644
--- a/components/bookmarks/browser/bookmark_utils_unittest.cc
+++ b/components/bookmarks/browser/bookmark_utils_unittest.cc
@@ -315,7 +315,7 @@ TEST_F(BookmarkUtilsTest, PasteNonEditableNodes) {
   test::TestBookmarkClient client;
   // Load a model with an extra node that is not editable.
   BookmarkPermanentNode* extra_node = new BookmarkPermanentNode(100);
-  bookmarks::BookmarkPermanentNodeList extra_nodes;
+  BookmarkPermanentNodeList extra_nodes;
   extra_nodes.push_back(extra_node);
   client.SetExtraNodesToLoad(extra_nodes.Pass());
 
@@ -418,7 +418,7 @@ TEST_F(BookmarkUtilsTest, RemoveAllBookmarks) {
   test::TestBookmarkClient client;
   // Load a model with an extra node that is not editable.
   BookmarkPermanentNode* extra_node = new BookmarkPermanentNode(100);
-  bookmarks::BookmarkPermanentNodeList extra_nodes;
+  BookmarkPermanentNodeList extra_nodes;
   extra_nodes.push_back(extra_node);
   client.SetExtraNodesToLoad(extra_nodes.Pass());