Un-refcount AutofillWebData and TokenWebData

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__
@@ skipping 73 matching lines @@
   KeywordTable::Keywords keywords;
   // Identifies the ID of the TemplateURL that is the default search. A value of
   // 0 indicates there is no default search provider.
   int64 default_search_provider_id;
   // Version of the built-in keywords. A value of 0 indicates a first run.
   int builtin_keyword_version;
 };
 
 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(
       content::BrowserContext* context);
 
   WebDataService(scoped_refptr<WebDatabaseService> wdbs,
                  const ProfileErrorCallback& callback);
 
   //////////////////////////////////////////////////////////////////////////////
   //
@@ skipping 111 matching lines @@
                      WebDataServiceConsumer* consumer);
 #endif  // defined(OS_WIN)
 
  protected:
   // For unit tests, passes a null callback.
   WebDataService();
 
   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.
   //
   //////////////////////////////////////////////////////////////////////////////
 
   //////////////////////////////////////////////////////////////////////////////
   //
   // Keywords.
   //
@@ skipping 59 matching lines @@
   WebDatabase::State RemoveIE7LoginImpl(
       const IE7PasswordInfo& info, WebDatabase* db);
   scoped_ptr<WDTypedResult> GetIE7LoginImpl(
       const IE7PasswordInfo& info, WebDatabase* db);
 #endif  // defined(OS_WIN)
 
   DISALLOW_COPY_AND_ASSIGN(WebDataService);
 };
 
 #endif  // CHROME_BROWSER_WEBDATA_WEB_DATA_SERVICE_H__