Converting BookmarkModel and HistoryService to ProfileKeyedServices. This just performs the initial…

chrome/browser/bookmarks/bookmark_model.cc

Index: chrome/browser/bookmarks/bookmark_model.cc
===================================================================
--- chrome/browser/bookmarks/bookmark_model.cc	(revision 137731)
+++ chrome/browser/bookmarks/bookmark_model.cc	(working copy)
@@ -152,22 +152,13 @@
   }
 }
 
-// static
-void BookmarkModel::RegisterUserPrefs(PrefService* prefs) {
-  // Don't sync this, as otherwise, due to a limitation in sync, it
-  // will cause a deadlock (see http://crbug.com/97955).  If we truly
-  // want to sync the expanded state of folders, it should be part of
-  // bookmark sync itself (i.e., a property of the sync folder nodes).
-  prefs->RegisterListPref(prefs::kBookmarkEditorExpandedNodes, new ListValue,
-                          PrefService::UNSYNCABLE_PREF);
-}
-
-void BookmarkModel::Cleanup() {
+void BookmarkModel::Shutdown() {
   if (loaded_)
     return;
 
   // See comment in Profile shutdown code where this is invoked for details.
   loaded_signal_.Signal();
+  expanded_state_tracker_->Cleanup();
 }
 
 void BookmarkModel::Load() {
@@ -179,7 +170,7 @@
   }
 
   expanded_state_tracker_.reset(new BookmarkExpandedStateTracker(
-      profile_, prefs::kBookmarkEditorExpandedNodes));
+      profile_, prefs::kBookmarkEditorExpandedNodes, this));
 
   // Listen for changes to favicons so that we can update the favicon of the
   // node appropriately.