Un-refcount AutofillWebData and TokenWebData

android_webview/browser/aw_form_database_service.h

Index: android_webview/browser/aw_form_database_service.h
diff --git a/android_webview/browser/aw_form_database_service.h b/android_webview/browser/aw_form_database_service.h
index cb66d4e4dd74ce0d08555d33c6f0bbe7014fb4e6..ad1af3ee381f65240f0b312175954efb35351e9d 100644
--- a/android_webview/browser/aw_form_database_service.h
+++ b/android_webview/browser/aw_form_database_service.h
@@ -33,7 +33,7 @@ class AwFormDatabaseService : public WebDataServiceConsumer {
   // Clear any saved form data. Executes asynchronously.
   void ClearFormData();
 
-  scoped_refptr<autofill::AutofillWebDataService>
+  autofill::AutofillWebDataService*
       get_autofill_webdata_service();
 
   // WebDataServiceConsumer implementation.
@@ -52,7 +52,7 @@ class AwFormDatabaseService : public WebDataServiceConsumer {
   bool has_form_data_;
   base::WaitableEvent completion_;
 
-  scoped_refptr<autofill::AutofillWebDataService> autofill_data_;
+  scoped_ptr<autofill::AutofillWebDataService> autofill_data_;
   scoped_refptr<WebDatabaseService> web_database_;
 
   DISALLOW_COPY_AND_ASSIGN(AwFormDatabaseService);