Make ShortcutsBackend a ProfileKeyedService.

chrome/browser/history/shortcuts_backend.cc

 // Copyright (c) 2012 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/history/shortcuts_backend.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
@@ skipping 63 matching lines @@
     : last_access_time(base::Time::Now()),
       number_of_hits(0) {
 }
 
 ShortcutsBackend::Shortcut::~Shortcut() {
 }
 
 
 // ShortcutsBackend -----------------------------------------------------------
 
-ShortcutsBackend::ShortcutsBackend(const FilePath& db_folder_path,
-                                   Profile *profile)
+ShortcutsBackend::ShortcutsBackend(Profile* profile, bool suppress_db)
     : current_state_(NOT_INITIALIZED),
-      db_(new ShortcutsDatabase(db_folder_path)),
-      no_db_access_(db_folder_path.empty()) {
+      no_db_access_(suppress_db) {
+  if (!suppress_db)
+    db_ = new ShortcutsDatabase(profile);
   // |profile| can be NULL in tests.
   if (profile) {
     notification_registrar_.Add(this, chrome::NOTIFICATION_OMNIBOX_OPENED_URL,
                                 content::Source<Profile>(profile));
     notification_registrar_.Add(this, chrome::NOTIFICATION_HISTORY_URLS_DELETED,
                                 content::Source<Profile>(profile));
   }
 }
 
 bool ShortcutsBackend::Init() {
@@ skipping 158 matching lines @@
           match.description_class, base::Time::Now(),
           it->second.number_of_hits + 1));
       return;
     }
   }
   AddShortcut(Shortcut(base::GenerateGUID(), log->text, match.destination_url,
       match.contents, match.contents_class, match.description,
       match.description_class, base::Time::Now(), 1));
 }
 
+void ShortcutsBackend::ShutdownOnUIThread() {
+  DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
+         BrowserThread::CurrentlyOn(BrowserThread::UI));
+  notification_registrar_.RemoveAll();
+}
+
 }  // namespace history