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

chrome/browser/bookmarks/bookmark_expanded_state_tracker.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/bookmarks/bookmark_expanded_state_tracker.h"
 
 #include "base/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #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);
 }
 
 void BookmarkExpandedStateTracker::SetExpandedNodes(const Nodes& nodes) {
   UpdatePrefs(nodes);
 }
 
 BookmarkExpandedStateTracker::Nodes
 BookmarkExpandedStateTracker::GetExpandedNodes() {
   Nodes nodes;
@@ skipping 58 matching lines @@
   if (!profile_->GetPrefs())
     return;
 
   ListValue values;
   for (Nodes::const_iterator i = nodes.begin(); i != nodes.end(); ++i) {
     values.Set(values.GetSize(),
                new StringValue(base::Int64ToString((*i)->id())));
   }
   profile_->GetPrefs()->Set(pref_path_, values);
 }