Un-refcount AutofillWebData and TokenWebData

chrome/browser/webdata/token_web_data.h

Index: chrome/browser/webdata/token_web_data.h
diff --git a/chrome/browser/webdata/token_web_data.h b/chrome/browser/webdata/token_web_data.h
index f74f230da9aa832d31c7da726c78c418a802ddb7..9666621a0ca8a14138d403b82369f6f0c557f3ac 100644
--- a/chrome/browser/webdata/token_web_data.h
+++ b/chrome/browser/webdata/token_web_data.h
@@ -35,12 +35,13 @@ class BrowserContext;
 class TokenWebData : public WebDataServiceBase {
  public:
   // Retrieve a WebDataService for the given context.
-  static scoped_refptr<TokenWebData> FromBrowserContext(
-      content::BrowserContext* context);
+  static TokenWebData* FromBrowserContext(content::BrowserContext* context);
 
   TokenWebData(scoped_refptr<WebDatabaseService> wdbs,
                const ProfileErrorCallback& callback);
 
+  virtual ~TokenWebData();
+
   // Set a token to use for a specified service.
   void SetTokenForService(const std::string& service,
                           const std::string& token);
@@ -55,8 +56,6 @@ class TokenWebData : public WebDataServiceBase {
   // For unit tests, passes a null callback.
   TokenWebData();
 
-  virtual ~TokenWebData();
-
  private:
   scoped_refptr<TokenWebDataBackend> token_backend_;