Make ShortcutsBackend a ProfileKeyedService.

chrome/browser/history/shortcuts_backend.h

 // 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.
 
 #ifndef CHROME_BROWSER_HISTORY_SHORTCUTS_BACKEND_H_
 #define CHROME_BROWSER_HISTORY_SHORTCUTS_BACKEND_H_
 #pragma once
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/string16.h"
 #include "base/synchronization/lock.h"
 #include "base/time.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
+#include "chrome/browser/profiles/refcounted_profile_keyed_service.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "googleurl/src/gurl.h"
 
 class Profile;
 
 namespace history {
 
 class ShortcutsDatabase;
 
 // This class manages the shortcut provider backend - access to database on the
 // db thread, etc.
-class ShortcutsBackend : public base::RefCountedThreadSafe<ShortcutsBackend>,
+class ShortcutsBackend : public RefcountedProfileKeyedService,
                          public content::NotificationObserver {
  public:
   // The following struct encapsulates one previously selected omnibox shortcut.
   struct Shortcut {
     Shortcut(const std::string& id,
              const string16& text,
              const GURL& url,
              const string16& contents,
              const ACMatchClassifications& contents_class,
              const string16& description,
@@ skipping 18 matching lines @@
     string16 description;
     ACMatchClassifications description_class;
 
     base::Time last_access_time;  // Last time shortcut was selected.
     int number_of_hits;           // How many times shortcut was selected.
   };
 
   typedef std::multimap<string16, ShortcutsBackend::Shortcut> ShortcutMap;
 
   // |profile| is necessary for profile notifications only and can be NULL in
-  // unit-tests. |db_folder_path| could be an empty path only in unit-tests as
-  // well. It means there is no database created, all things are done in memory.
-  ShortcutsBackend(const FilePath& db_folder_path, Profile* profile);
+  // unit-tests. For unit testing, set |suppress_db| to true to prevent creation
+  // of the database, in which case all operations are performed in memory only.
+  ShortcutsBackend(Profile* profile, bool suppress_db);
 
   // The interface is guaranteed to be called on the thread AddObserver()
   // was called.
   class ShortcutsBackendObserver {
    public:
     // Called after the database is loaded and Init() completed.
     virtual void OnShortcutsLoaded() = 0;
     // Called when shortcuts changed (added/updated/removed) in the database.
     virtual void OnShortcutsChanged() {}
 
@@ skipping 49 matching lines @@
   void InitInternal();
 
   // Finishes initialization on UI thread, notifies all observers.
   void InitCompleted();
 
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
+  // RefcountedProfileKeyedService
+  virtual void ShutdownOnUIThread() OVERRIDE;
+
   enum CurrentState {
     NOT_INITIALIZED,  // Backend created but not initialized.
     INITIALIZING,  // Init() called, but not completed yet.
     INITIALIZED,  // Initialization completed, all accessors can be safely
                   // called.
   };
+
   CurrentState current_state_;
   ObserverList<ShortcutsBackendObserver> observer_list_;
   scoped_refptr<ShortcutsDatabase> db_;
 
   // The |temp_shortcuts_map_| and |temp_guid_map_| used for temporary storage
   // between InitInternal() and InitComplete() to avoid doing a potentially huge
   // copy.
   scoped_ptr<ShortcutMap> temp_shortcuts_map_;
   scoped_ptr<GuidToShortcutsIteratorMap> temp_guid_map_;
 
   ShortcutMap shortcuts_map_;
   // This is a helper map for quick access to a shortcut by guid.
   GuidToShortcutsIteratorMap guid_map_;
 
   content::NotificationRegistrar notification_registrar_;
 
   // For some unit-test only.
   bool no_db_access_;
 
   DISALLOW_COPY_AND_ASSIGN(ShortcutsBackend);
 };
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_SHORTCUTS_BACKEND_H_