Eliminate AutofillWebDataService::FromBrowserContext().

android_webview/native/aw_autofill_manager_delegate.cc

Index: android_webview/native/aw_autofill_manager_delegate.cc
diff --git a/android_webview/native/aw_autofill_manager_delegate.cc b/android_webview/native/aw_autofill_manager_delegate.cc
index df2769c24476151534a36607efe40c3592a4cc2e..9be482b914d131388d4bf2175a1a7526d6ee89b7 100644
--- a/android_webview/native/aw_autofill_manager_delegate.cc
+++ b/android_webview/native/aw_autofill_manager_delegate.cc
@@ -6,6 +6,7 @@
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_content_browser_client.h"
+#include "android_webview/browser/aw_form_database_service.h"
 #include "android_webview/browser/aw_pref_store.h"
 #include "android_webview/native/aw_contents.h"
 #include "base/android/jni_android.h"
@@ -74,8 +75,10 @@ AwAutofillManagerDelegate::GetPersonalDataManager() {
 
 scoped_refptr<autofill::AutofillWebDataService>
 AwAutofillManagerDelegate::GetDatabase() {
-  return autofill::AutofillWebDataService::FromBrowserContext(
-      web_contents_->GetBrowserContext());
+  android_webview::AwFormDatabaseService* service =
+      static_cast<android_webview::AwBrowserContext*>(
+          web_contents_->GetBrowserContext())->GetFormDatabaseService();
+  return service->get_autofill_webdata_service();
 }
 
 void AwAutofillManagerDelegate::ShowAutofillPopup(