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

chrome/browser/bookmarks/bookmark_expanded_state_tracker.cc

Index: chrome/browser/bookmarks/bookmark_expanded_state_tracker.cc
===================================================================
--- chrome/browser/bookmarks/bookmark_expanded_state_tracker.cc	(revision 137731)
+++ chrome/browser/bookmarks/bookmark_expanded_state_tracker.cc	(working copy)
@@ -10,14 +10,19 @@
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 
-BookmarkExpandedStateTracker::BookmarkExpandedStateTracker(Profile* profile,
-                                                           const char* path)
+BookmarkExpandedStateTracker::BookmarkExpandedStateTracker(
+    Profile* profile,
+    const char* path,
+    BookmarkModel* bookmark_model)

[rpetterson, 2012/05/18 22:32:44]

We need to pass this in because this is initialized during load and calling
GetForProfile won't work yet, resulting in problems when AddObserver is called
on bookmark_model.

     : profile_(profile),
       pref_path_(path) {
-  profile_->GetBookmarkModel()->AddObserver(this);
+  bookmark_model->AddObserver(this);
 }
 
 BookmarkExpandedStateTracker::~BookmarkExpandedStateTracker() {
+}
+
+void BookmarkExpandedStateTracker::Cleanup() {

[sky, 2012/05/21 14:23:06]

Move this to BookmarkModelBeingDeleted

[rpetterson, 2012/05/21 18:01:49]

Done.

   profile_->GetBookmarkModel()->RemoveObserver(this);
 }