Eliminate AutofillWebDataService::FromBrowserContext().

android_webview/native/aw_autofill_manager_delegate.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/native/aw_autofill_manager_delegate.h"
 
 #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"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/logging.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/pref_service_builder.h"
 #include "components/autofill/core/browser/autofill_popup_delegate.h"
@@ skipping 47 matching lines @@
       AwContentBrowserClient::GetAwBrowserContext());
 }
 
 autofill::PersonalDataManager*
 AwAutofillManagerDelegate::GetPersonalDataManager() {
   return NULL;
 }
 
 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();
+  DCHECK(service);

[Ilya Sherman, 2013/11/14 23:54:33]

nit: This is redundant with just making a method call on the service on the line
below, IMO.

[blundell, 2013/11/19 14:05:37]

Done.

+  return service->get_autofill_webdata_service();
 }
 
 void AwAutofillManagerDelegate::ShowAutofillPopup(
     const gfx::RectF& element_bounds,
     base::i18n::TextDirection text_direction,
     const std::vector<string16>& values,
     const std::vector<string16>& labels,
     const std::vector<string16>& icons,
     const std::vector<int>& identifiers,
     base::WeakPtr<autofill::AutofillPopupDelegate> delegate) {
@@ skipping 101 matching lines @@
     const GURL& source_url,
     const base::Callback<void(const autofill::FormStructure*)>& callback) {
   NOTIMPLEMENTED();
 }
 
 bool RegisterAwAutofillManagerDelegate(JNIEnv* env) {
   return RegisterNativesImpl(env) >= 0;
 }
 
 } // namespace android_webview