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..7f6e39fa7b1d1c7f8b211e68b7c5a18fe480568b 100644
--- a/chrome/browser/webdata/web_data_service.h
+++ b/chrome/browser/webdata/web_data_service.h
@@ -91,7 +91,9 @@ struct WDKeywordsResult {
 
 class WebDataServiceConsumer;
 
-class WebDataService : public WebDataServiceBase {
+class WebDataService : public WebDataServiceBase,
+                       public base::RefCountedThreadSafe<WebDataService,
+                          content::BrowserThread::DeleteOnUIThread> {

[Lei Zhang, 2013/06/07 20:42:49]

IWYU: add content/public/browser/browser_thread.h

[Cait (Slow), 2013/06/07 21:00:42]

Done.

  public:
   // Retrieve a WebDataService for the given context.
   static scoped_refptr<WebDataService> FromBrowserContext(
@@ -223,6 +225,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.