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

chrome/browser/bookmarks/bookmark_expanded_state_tracker.h

Index: chrome/browser/bookmarks/bookmark_expanded_state_tracker.h
===================================================================
--- chrome/browser/bookmarks/bookmark_expanded_state_tracker.h	(revision 137731)
+++ chrome/browser/bookmarks/bookmark_expanded_state_tracker.h	(working copy)
@@ -20,9 +20,15 @@
  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();