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

chrome/browser/history/history.h

Index: chrome/browser/history/history.h
===================================================================
--- chrome/browser/history/history.h	(revision 137731)
+++ chrome/browser/history/history.h	(working copy)
@@ -19,6 +19,7 @@
 #include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/history/history_types.h"
+#include "chrome/browser/profiles/refcounted_profile_keyed_service.h"
 #include "chrome/browser/search_engines/template_url_id.h"
 #include "chrome/common/ref_counted_util.h"
 #include "content/public/browser/notification_observer.h"
@@ -96,7 +97,7 @@
 // thread that made the request.
 class HistoryService : public CancelableRequestProvider,
                        public content::NotificationObserver,
-                       public base::RefCountedThreadSafe<HistoryService> {
+                       public RefcountedProfileKeyedService {
  public:
   // Miscellaneous commonly-used types.
   typedef std::vector<PageUsageData*> PageUsageDataList;
@@ -159,6 +160,9 @@
     return in_memory_url_index_.get();
   }
 
+  // RefcountedProfileKeyedService:
+  void ShutdownOnUIThread() OVERRIDE;
+
   // Navigation ----------------------------------------------------------------
 
   // Adds the given canonical URL to history with the current time as the visit