Make WebDataService no longer depend on 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 f66d9dc14c9019f69ed038d546e49f09c1296e1b..4d3219f09e830f4928b995e574e8da8c39b76357 100644
--- a/chrome/browser/webdata/web_data_service.h
+++ b/chrome/browser/webdata/web_data_service.h
@@ -23,7 +23,6 @@
 #include "chrome/browser/api/webdata/web_data_results.h"
 #include "chrome/browser/api/webdata/web_data_service_base.h"
 #include "chrome/browser/api/webdata/web_data_service_consumer.h"
-#include "chrome/browser/profiles/refcounted_profile_keyed_service.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_id.h"
 #include "chrome/browser/webdata/keyword_table.h"
@@ -104,9 +103,10 @@ struct WDKeywordsResult {
 class WebDataServiceConsumer;
 
 class WebDataService
-    : public WebDataServiceBase,
-      public AutofillWebData,
-      public RefcountedProfileKeyedService {
+    : public base::RefCountedThreadSafe<WebDataService,
+          content::BrowserThread::DeleteOnUIThread>,
+      public WebDataServiceBase,
+      public AutofillWebData {
  public:
   // Retrieve a WebDataService for the given context.
   static scoped_refptr<WebDataService> FromBrowserContext(
@@ -125,10 +125,9 @@ 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() OVERRIDE;
+  void ShutdownOnUIThread();
 
   // Initializes the web data service.
   void Init(const base::FilePath& path);