Move BookmarkStorage into bookmarks namespace.

components/bookmarks/browser/bookmark_model.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_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_
 #define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_
 
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/strings/string16.h"
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
 #include "components/bookmarks/browser/bookmark_client.h"
 #include "components/bookmarks/browser/bookmark_node.h"
 #include "components/bookmarks/browser/bookmark_service.h"
 #include "ui/gfx/image/image.h"
 #include "url/gurl.h"
 
 class BookmarkExpandedStateTracker;
 class BookmarkIndex;
-class BookmarkLoadDetails;
 class BookmarkModelObserver;
-class BookmarkStorage;
 struct BookmarkMatch;
 class PrefService;
 class ScopedGroupBookmarkActions;
 
 namespace base {
 class FilePath;
 class SequencedTaskRunner;
 }
 
 namespace bookmarks {
+class BookmarkLoadDetails;
+class BookmarkStorage;
 class ScopedGroupBookmarkActions;
 }
 
 namespace favicon_base {
 struct FaviconImageResult;
 }
 
 namespace test {
 class TestBookmarkClient;
 }
@@ skipping 227 matching lines @@
   // Notify BookmarkModel that the favicons for |urls| have changed and have to
   // be refetched. This notification is sent by BookmarkClient.
   void OnFaviconChanged(const std::set<GURL>& urls);
 
   // Returns the client used by this BookmarkModel.
   BookmarkClient* client() const { return client_; }
 
  private:
   friend class BookmarkCodecTest;
   friend class BookmarkModelTest;
-  friend class BookmarkStorage;
+  friend class bookmarks::BookmarkStorage;
   friend class bookmarks::ScopedGroupBookmarkActions;
   friend class test::TestBookmarkClient;
 
   // Used to order BookmarkNodes by URL.
   class NodeURLComparator {
    public:
     bool operator()(const BookmarkNode* n1, const BookmarkNode* n2) const {
       return n1->url() < n2->url();
     }
   };
 
   // Implementation of IsBookmarked. Before calling this the caller must obtain
   // a lock on |url_lock_|.
   bool IsBookmarkedNoLock(const GURL& url);
 
   // Removes the node from internal maps and recurses through all children. If
   // the node is a url, its url is added to removed_urls.
   //
   // This does NOT delete the node.
   void RemoveNode(BookmarkNode* node, std::set<GURL>* removed_urls);
 
   // 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);
 
   // Removes the node from its parent, but does not delete it. No notifications
   // are sent. |removed_urls| is populated with the urls which no longer have
   // any bookmarks associated with them.
   // This method should be called after acquiring |url_lock_|.
   void RemoveNodeAndGetRemovedUrls(BookmarkNode* node,
                                    std::set<GURL>* removed_urls);
@@ skipping 43 matching lines @@
   // Generates and returns the next node ID.
   int64 generate_next_node_id();
 
   // Sets the maximum node ID to the given value.
   // This is used by BookmarkCodec to report the maximum ID after it's done
   // decoding since during decoding codec assigns node IDs.
   void set_next_node_id(int64 id) { next_node_id_ = id; }
 
   // 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_;
 
   // Whether the initial set of data has been loaded.
   bool loaded_;
 
   // The root node. This contains the bookmark bar node, the 'other' node and
   // the mobile node as children.
   BookmarkNode root_;
@@ skipping 13 matching lines @@
   // WARNING: |nodes_ordered_by_url_set_| is accessed on multiple threads. As
   // such, be sure and wrap all usage of it around |url_lock_|.
   typedef std::multiset<BookmarkNode*, NodeURLComparator> NodesOrderedByURLSet;
   NodesOrderedByURLSet nodes_ordered_by_url_set_;
   base::Lock url_lock_;
 
   // Used for loading favicons.
   base::CancelableTaskTracker cancelable_task_tracker_;
 
   // Reads/writes bookmarks to disk.
-  scoped_refptr<BookmarkStorage> store_;
+  scoped_refptr<bookmarks::BookmarkStorage> store_;
 
   scoped_ptr<BookmarkIndex> index_;
 
   // True if URLs are stored in the BookmarkIndex in addition to bookmark
   // titles.
   const bool index_urls_;
 
   base::WaitableEvent loaded_signal_;
 
   // See description of IsDoingExtensiveChanges above.
   int extensive_changes_;
 
   scoped_ptr<BookmarkExpandedStateTracker> expanded_state_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkModel);
 };
 
 #endif  // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_