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

chrome/browser/bookmarks/bookmark_expanded_state_tracker.h

 // 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.
 
 #ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_EXPANDED_STATE_TRACKER_H_
 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_EXPANDED_STATE_TRACKER_H_
 #pragma once
 
 #include <set>
 
 #include "chrome/browser/bookmarks/base_bookmark_model_observer.h"
 
 class BookmarkNode;
 class Profile;
 
 // 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.
 class BookmarkExpandedStateTracker : public BaseBookmarkModelObserver {
  public:
   typedef std::set<const BookmarkNode*> Nodes;
 
-  BookmarkExpandedStateTracker(Profile* profile, const char* path);
+  BookmarkExpandedStateTracker(Profile* profile,
+                               const char* path,
+                               BookmarkModel* bookmark_model);
   virtual ~BookmarkExpandedStateTracker();
 
+  // The bookmark model is already considered deleted by the time we enter the
+  // dtor so we perform some cleanup first.
+  void Cleanup();
+
   // The set of expanded nodes.
   void SetExpandedNodes(const Nodes& nodes);
   Nodes GetExpandedNodes();
 
   // BookmarkModelObserver:
   virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE;
   virtual void BookmarkModelChanged() OVERRIDE;
   virtual void BookmarkModelBeingDeleted(BookmarkModel* model) OVERRIDE;
   virtual void BookmarkNodeRemoved(BookmarkModel* model,
                                    const BookmarkNode* parent,
                                    int old_index,
                                    const BookmarkNode* node) OVERRIDE;
 
  private:
   // Resets the value in preferences from |expanded_nodes_|.
   void UpdatePrefs(const Nodes& nodes);
 
   Profile* profile_;
 
   // Preferences path expanded state is stored under.
   const char* pref_path_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkExpandedStateTracker);
 };
 
 #endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_EXPANDED_STATE_TRACKER_H_