Moved WebDataService to ProfileKeyedService

chrome/browser/webdata/web_data_service.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.
 
 // Chromium settings and storage represent user-selected preferences and
 // information and MUST not be extracted, overwritten or modified except
 // through Chromium defined APIs.
 
 #ifndef CHROME_BROWSER_WEBDATA_WEB_DATA_SERVICE_H__
 #define CHROME_BROWSER_WEBDATA_WEB_DATA_SERVICE_H__
 #pragma once
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/file_path.h"
 #include "base/location.h"
 #include "base/message_loop_helpers.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_id.h"
+#include "chrome/browser/profiles/refcounted_profile_keyed_service.h"
 #include "chrome/browser/webdata/keyword_table.h"
 #include "content/public/browser/browser_thread.h"
 #include "sql/init_status.h"
 
 class AutocompleteSyncableService;
 class AutofillChange;
 class AutofillProfile;
 class AutofillProfileSyncableService;
 class CreditCard;
 struct DefaultWebIntentService;
@@ skipping 144 matching lines @@
   }
 
  private:
   // mutable to keep GetValue() const.
   mutable T value_;
   DISALLOW_COPY_AND_ASSIGN(WDObjectResult);
 };
 
 class WebDataServiceConsumer;
 
-class WebDataService
-    : public base::RefCountedThreadSafe<
-          WebDataService, content::BrowserThread::DeleteOnUIThread> {
+class WebDataService : public RefcountedProfileKeyedService {
  public:
   // All requests return an opaque handle of the following type.
   typedef int Handle;
 
   //////////////////////////////////////////////////////////////////////////////
   //
   // Internal requests
   //
   // Every request is processed using a request object. The object contains
   // both the request parameters and the results.
@@ skipping 93 matching lines @@
 
   WebDataService();
 
   // Notifies listeners on the UI thread that multiple changes have been made to
   // to Autofill records of the database.
   // NOTE: This method is intended to be called from the DB thread.  It
   // it asynchronously notifies listeners on the UI thread.
   // |web_data_service| may be NULL for testing purposes.
   static void NotifyOfMultipleAutofillChanges(WebDataService* web_data_service);
 
+  // RefcountedProfileKeyedService override:
+  // Shutdown the web data service. The service can no longer be used after this
+  // call.
+  virtual void ShutdownOnUIThread() OVERRIDE;
+
   // Initializes the web data service. Returns false on failure
   // Takes the path of the profile directory as its argument.
   bool Init(const FilePath& profile_path);
 
-  // Shutdown the web data service. The service can no longer be used after this
-  // call.
-  void Shutdown();
-
   // Returns false if Shutdown() has been called.
   bool IsRunning() const;
 
   // Unloads the database without actually shutting down the service.  This can
   // be used to temporarily reduce the browser process' memory footprint.
   void UnloadDatabase();
 
   // Cancel any pending request. You need to call this method if your
   // WebDataServiceConsumer is about to be deleted.
   void CancelRequest(Handle h);
@@ skipping 464 matching lines @@
   // result can be NULL, if no result is expected or if the database could
   // not be opened. The result object is destroyed after this call.
   virtual void OnWebDataServiceRequestDone(WebDataService::Handle h,
                                            const WDTypedResult* result) = 0;
 
  protected:
   virtual ~WebDataServiceConsumer() {}
 };
 
 #endif  // CHROME_BROWSER_WEBDATA_WEB_DATA_SERVICE_H__