Move BookmarkStorage into bookmarks namespace.

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

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

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

components/bookmarks/browser/bookmark_model.cc

@@ -26,6 +26,8 @@
 #include "ui/gfx/favicon_size.h"
 
 using base::Time;
+using bookmarks::BookmarkLoadDetails;
+using bookmarks::BookmarkStorage;
 
 namespace {
 

components/bookmarks/browser/bookmark_model.h

@@ -25,9 +25,7 @@
 
 class BookmarkExpandedStateTracker;
 class BookmarkIndex;
-class BookmarkLoadDetails;
 class BookmarkModelObserver;
-class BookmarkStorage;
 struct BookmarkMatch;
 class PrefService;
 class ScopedGroupBookmarkActions;
@@ -38,6 +36,8 @@ class SequencedTaskRunner;
 }
 
 namespace bookmarks {
+class BookmarkLoadDetails;
+class BookmarkStorage;
 class ScopedGroupBookmarkActions;
 }
 
@@ -285,7 +285,7 @@ class BookmarkModel : public BookmarkService {
  private:
   friend class BookmarkCodecTest;
   friend class BookmarkModelTest;
-  friend class BookmarkStorage;
+  friend class bookmarks::BookmarkStorage;
   friend class bookmarks::ScopedGroupBookmarkActions;
   friend class test::TestBookmarkClient;
 
@@ -309,7 +309,7 @@ class BookmarkModel : public BookmarkService {
 
   // Invoked when loading is finished. Sets |loaded_| and notifies observers.
   // BookmarkModel takes ownership of |details|.
-  void DoneLoading(scoped_ptr<BookmarkLoadDetails> details);
+  void DoneLoading(scoped_ptr<bookmarks::BookmarkLoadDetails> details);
 
   // Populates |nodes_ordered_by_url_set_| from root.
   void PopulateNodesByURL(BookmarkNode* node);
@@ -373,7 +373,7 @@ class BookmarkModel : public BookmarkService {
 
   // Creates and returns a new BookmarkLoadDetails. It's up to the caller to
   // delete the returned object.
-  scoped_ptr<BookmarkLoadDetails> CreateLoadDetails(
+  scoped_ptr<bookmarks::BookmarkLoadDetails> CreateLoadDetails(
       const std::string& accept_languages);
 
   BookmarkClient* const client_;
@@ -407,7 +407,7 @@ class BookmarkModel : public BookmarkService {
   base::CancelableTaskTracker cancelable_task_tracker_;
 
   // Reads/writes bookmarks to disk.
-  scoped_refptr<BookmarkStorage> store_;
+  scoped_refptr<bookmarks::BookmarkStorage> store_;
 
   scoped_ptr<BookmarkIndex> index_;
 

components/bookmarks/browser/bookmark_storage.cc

@@ -20,6 +20,8 @@
 
 using base::TimeTicks;
 
+namespace bookmarks {
+
 namespace {
 
 // Extension used for backup files (copy of main file created during startup).
@@ -185,3 +187,5 @@ bool BookmarkStorage::SaveNow() {
   writer_.WriteNow(data);
   return true;
 }
+
+}  // namespace bookmarks

components/bookmarks/browser/bookmark_storage.h

@@ -18,6 +18,8 @@ namespace base {
 class SequencedTaskRunner;
 }
 
+namespace bookmarks {
+
 // BookmarkLoadDetails is used by BookmarkStorage when loading bookmarks.
 // BookmarkModel creates a BookmarkLoadDetails and passes it (including
 // ownership) to BookmarkStorage. BookmarkStorage loads the bookmarks (and
@@ -163,4 +165,6 @@ class BookmarkStorage : public base::ImportantFileWriter::DataSerializer,
   DISALLOW_COPY_AND_ASSIGN(BookmarkStorage);
 };
 
+}  // namespace bookmarks
+
 #endif  // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_STORAGE_H_