Make ShortcutsBackend a ProfileKeyedService.

chrome/browser/profiles/profile_impl.cc

Index: chrome/browser/profiles/profile_impl.cc
===================================================================
--- chrome/browser/profiles/profile_impl.cc	(revision 145147)
+++ chrome/browser/profiles/profile_impl.cc	(working copy)
@@ -42,6 +42,7 @@
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/shortcuts_backend.h"
+#include "chrome/browser/history/shortcuts_backend_factory.h"

[Miranda Callahan, 2012/07/03 15:23:41]

does this need to be added?

[mrossetti, 2012/07/03 16:42:29]

No, removed.

 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/metrics/metrics_service.h"
@@ -795,16 +796,6 @@
   return HistoryServiceFactory::GetForProfileIfExists(this).get();
 }
 
-history::ShortcutsBackend* ProfileImpl::GetShortcutsBackend() {
-  // This is called on one thread only - UI, so no magic is needed to protect
-  // against the multiple concurrent calls.
-  if (!shortcuts_backend_.get()) {
-    shortcuts_backend_ = new history::ShortcutsBackend(GetPath(), this);
-    CHECK(shortcuts_backend_->Init());
-  }
-  return shortcuts_backend_.get();
-}
-
 DownloadManagerDelegate* ProfileImpl::GetDownloadManagerDelegate() {
   return DownloadServiceFactory::GetForProfile(this)->
       GetDownloadManagerDelegate();