Moved WebDataService to ProfileKeyedService

chrome/browser/webdata/web_data_service.h

Index: chrome/browser/webdata/web_data_service.h
diff --git a/chrome/browser/webdata/web_data_service.h b/chrome/browser/webdata/web_data_service.h
index 9f0ac30d07ee6de7406737730ad4e55043f19f36..69369f9a372dfae09bf0b5d88a71d469ace959bd 100644
--- a/chrome/browser/webdata/web_data_service.h
+++ b/chrome/browser/webdata/web_data_service.h
@@ -21,6 +21,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.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"
@@ -185,9 +186,7 @@ template <class T> class WDObjectResult : public WDTypedResult {
 
 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;
@@ -301,14 +300,15 @@ class WebDataService
   // |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();

[Ilya Sherman, 2012/03/27 01:01:17]

nit: Please annotate this with OVERRIDE

[GeorgeY, 2012/03/30 19:20:12]

Done.

+
   // 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;