Un-refcount AutofillWebData and TokenWebData

components/autofill/browser/webdata/autofill_webdata_service.h

Index: components/autofill/browser/webdata/autofill_webdata_service.h
diff --git a/components/autofill/browser/webdata/autofill_webdata_service.h b/components/autofill/browser/webdata/autofill_webdata_service.h
index b861c64a83dd224c8501acbab0d97418a75ae129..a85896d070716437d5d8fb7c3ab3b93e1ade8a35 100644
--- a/components/autofill/browser/webdata/autofill_webdata_service.h
+++ b/components/autofill/browser/webdata/autofill_webdata_service.h
@@ -43,9 +43,11 @@ class AutofillWebDataService : public AutofillWebData,
   AutofillWebDataService(scoped_refptr<WebDatabaseService> wdbs,
                          const ProfileErrorCallback& callback);
 
+  virtual ~AutofillWebDataService();
+
   // Retrieve an AutofillWebDataService for the given context.
   // Can return NULL in some contexts.
-  static scoped_refptr<AutofillWebDataService> FromBrowserContext(
+  static AutofillWebDataService* FromBrowserContext(
       content::BrowserContext* context);
 
   // WebDataServiceBase implementation.
@@ -101,8 +103,6 @@ class AutofillWebDataService : public AutofillWebData,
       const base::Callback<void(AutofillWebDataBackend*)>& callback);
 
  protected:
-  virtual ~AutofillWebDataService();
-
   virtual void NotifyAutofillMultipleChangedOnUIThread();
 
   base::WeakPtr<AutofillWebDataService> AsWeakPtr() {