Un-refcount AutofillWebData and TokenWebData

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 2904e2e20e56eb4e45527f1dfc238c28392a47ff..a2c3caa0e35e2a6c5b121ff3d6d6f3c6bd096896 100644
--- a/chrome/browser/webdata/web_data_service.h
+++ b/chrome/browser/webdata/web_data_service.h
@@ -25,6 +25,7 @@
 #include "components/webdata/common/web_data_service_base.h"
 #include "components/webdata/common/web_data_service_consumer.h"
 #include "components/webdata/common/web_database.h"
+#include "content/public/browser/browser_thread.h"
 
 struct DefaultWebIntentService;
 class GURL;
@@ -91,7 +92,9 @@ struct WDKeywordsResult {
 
 class WebDataServiceConsumer;
 
-class WebDataService : public WebDataServiceBase {
+class WebDataService : public WebDataServiceBase,
+                       public base::RefCountedThreadSafe<WebDataService,
+                          content::BrowserThread::DeleteOnUIThread> {
  public:
   // Retrieve a WebDataService for the given context.
   static scoped_refptr<WebDataService> FromBrowserContext(
@@ -223,6 +226,12 @@ class WebDataService : public WebDataServiceBase {
   virtual ~WebDataService();
 
  private:
+  friend struct content::BrowserThread::DeleteOnThread<
+      content::BrowserThread::UI>;
+  friend class base::DeleteHelper<WebDataService>;
+  // We have to friend RCTS<> so WIN shared-lib build is happy (crbug/112250).
+  friend class base::RefCountedThreadSafe<WebDataService,
+      content::BrowserThread::DeleteOnUIThread>;
   //////////////////////////////////////////////////////////////////////////////
   //
   // The following methods are only invoked on the DB thread.