Un-refcount AutofillWebData and TokenWebData

android_webview/browser/aw_form_database_service.cc

Index: android_webview/browser/aw_form_database_service.cc
diff --git a/android_webview/browser/aw_form_database_service.cc b/android_webview/browser/aw_form_database_service.cc
index d08ed0e2da2301372c2b9187b80a974f77b36d89..4958cb8f643643abb8e6cf333a365c021b5e80ef 100644
--- a/android_webview/browser/aw_form_database_service.cc
+++ b/android_webview/browser/aw_form_database_service.cc
@@ -34,8 +34,8 @@ AwFormDatabaseService::AwFormDatabaseService(const base::FilePath path)
           l10n_util::GetDefaultLocale())));
   web_database_->LoadDatabase();
 
-  autofill_data_ = new autofill::AutofillWebDataService(
-      web_database_, base::Bind(&DatabaseErrorCallback));
+  autofill_data_ .reset(new autofill::AutofillWebDataService(
+      web_database_, base::Bind(&DatabaseErrorCallback)));
   autofill_data_->Init();
 }
 
@@ -58,9 +58,9 @@ void AwFormDatabaseService::CancelPendingQuery() {
   }
 }
 
-scoped_refptr<autofill::AutofillWebDataService>
+autofill::AutofillWebDataService*
 AwFormDatabaseService::get_autofill_webdata_service() {
-  return autofill_data_;
+  return autofill_data_.get();
 }
 
 void AwFormDatabaseService::ClearFormData() {