Move BookmarkExpandedStateTracker into bookmarks namespace.

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

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

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

5 files changed, 16 insertions, 3 deletions

diff --git a/components/bookmarks/browser/bookmark_expanded_state_tracker.cc b/components/bookmarks/browser/bookmark_expanded_state_tracker.cc
index acc5cc0a..4b4f04c 100644
--- a/components/bookmarks/browser/bookmark_expanded_state_tracker.cc
+++ b/components/bookmarks/browser/bookmark_expanded_state_tracker.cc
@@ -11,6 +11,8 @@
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/bookmarks/common/bookmark_pref_names.h"
 
+namespace bookmarks {
+
 BookmarkExpandedStateTracker::BookmarkExpandedStateTracker(
     BookmarkModel* bookmark_model,
     PrefService* pref_service)
@@ -108,3 +110,5 @@ void BookmarkExpandedStateTracker::UpdatePrefs(const Nodes& nodes) {
 
   pref_service_->Set(prefs::kBookmarkEditorExpandedNodes, values);
 }
+
+}  // namespace bookmarks
diff --git a/components/bookmarks/browser/bookmark_expanded_state_tracker.h b/components/bookmarks/browser/bookmark_expanded_state_tracker.h
index 3bd8633..6aadaf2 100644
--- a/components/bookmarks/browser/bookmark_expanded_state_tracker.h
+++ b/components/bookmarks/browser/bookmark_expanded_state_tracker.h
@@ -13,6 +13,8 @@ class BookmarkModel;
 class BookmarkNode;
 class PrefService;
 
+namespace bookmarks {
+
 // BookmarkExpandedStateTracker is used to track a set of expanded nodes. The
 // nodes are persisted in preferences. If an expanded node is removed from the
 // model BookmarkExpandedStateTracker removes the node.
@@ -53,4 +55,6 @@ class BookmarkExpandedStateTracker : public BaseBookmarkModelObserver {
   DISALLOW_COPY_AND_ASSIGN(BookmarkExpandedStateTracker);
 };
 
+}  // namespace bookmarks
+
 #endif  // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_EXPANDED_STATE_TRACKER_H_
diff --git a/components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc b/components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc
index 3cbe6e0..e33d4d3 100644
--- a/components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc
+++ b/components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc
@@ -18,6 +18,8 @@
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+namespace bookmarks {
+
 scoped_ptr<PrefService> PrefServiceForTesting() {
   scoped_refptr<user_prefs::PrefRegistrySyncable> registry(
       new user_prefs::PrefRegistrySyncable());
@@ -110,3 +112,5 @@ TEST_F(BookmarkExpandedStateTrackerTest, RemoveAllUserBookmarks) {
   // Verify node is not present.
   EXPECT_TRUE(tracker->GetExpandedNodes().empty());
 }
+
+}  // namespace bookmarks
diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmarks/browser/bookmark_model.cc
index f36c94c..8d0904e 100644
--- a/components/bookmarks/browser/bookmark_model.cc
+++ b/components/bookmarks/browser/bookmark_model.cc
@@ -26,6 +26,7 @@
 #include "ui/gfx/favicon_size.h"
 
 using base::Time;
+using bookmarks::BookmarkExpandedStateTracker;
 using bookmarks::BookmarkIndex;
 using bookmarks::BookmarkLoadDetails;
 using bookmarks::BookmarkMatch;
diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmarks/browser/bookmark_model.h
index 5a61bad..128f0c7 100644
--- a/components/bookmarks/browser/bookmark_model.h
+++ b/components/bookmarks/browser/bookmark_model.h
@@ -22,7 +22,6 @@
 #include "ui/gfx/image/image.h"
 #include "url/gurl.h"
 
-class BookmarkExpandedStateTracker;
 class BookmarkModelObserver;
 class PrefService;
 
@@ -32,6 +31,7 @@ class SequencedTaskRunner;
 }
 
 namespace bookmarks {
+class BookmarkExpandedStateTracker;
 class BookmarkIndex;
 class BookmarkLoadDetails;
 class BookmarkStorage;
@@ -257,7 +257,7 @@ class BookmarkModel {
 
   // Returns the object responsible for tracking the set of expanded nodes in
   // the bookmark editor.
-  BookmarkExpandedStateTracker* expanded_state_tracker() {
+  bookmarks::BookmarkExpandedStateTracker* expanded_state_tracker() {
     return expanded_state_tracker_.get();
   }
 
@@ -427,7 +427,7 @@ class BookmarkModel {
   // See description of IsDoingExtensiveChanges above.
   int extensive_changes_;
 
-  scoped_ptr<BookmarkExpandedStateTracker> expanded_state_tracker_;
+  scoped_ptr<bookmarks::BookmarkExpandedStateTracker> expanded_state_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkModel);
 };