Rename AutofillManagerDelegate to AutofillClient.

android_webview/native/aw_contents.cc

Index: android_webview/native/aw_contents.cc
diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc
index 18ff50f5a01b645e64dfdaea0695a21413893ce3..f71235410e577ed1f05d5246f89a20fa46318866 100644
--- a/android_webview/native/aw_contents.cc
+++ b/android_webview/native/aw_contents.cc
@@ -20,7 +20,7 @@
 #include "android_webview/common/aw_hit_test_data.h"
 #include "android_webview/common/aw_switches.h"
 #include "android_webview/common/devtools_instrumentation.h"
-#include "android_webview/native/aw_autofill_manager_delegate.h"
+#include "android_webview/native/aw_autofill_client.h"
 #include "android_webview/native/aw_browser_dependency_factory.h"
 #include "android_webview/native/aw_contents_client_bridge.h"
 #include "android_webview/native/aw_contents_io_thread_client_impl.h"
@@ -174,8 +174,8 @@ AwContents::AwContents(scoped_ptr<WebContents> web_contents)
   permission_request_handler_.reset(
       new PermissionRequestHandler(this, web_contents_.get()));
 
-  AwAutofillManagerDelegate* autofill_manager_delegate =
-      AwAutofillManagerDelegate::FromWebContents(web_contents_.get());
+  AwAutofillClient* autofill_manager_delegate =
+      AwAutofillClient::FromWebContents(web_contents_.get());
   InitDataReductionProxyIfNecessary();
   if (autofill_manager_delegate)
     InitAutofillIfNecessary(autofill_manager_delegate->GetSaveFormData());
@@ -220,7 +220,7 @@ void AwContents::SetSaveFormData(bool enabled) {
   // We need to check for the existence, since autofill_manager_delegate
   // may not be created when the setting is false.
   if (ContentAutofillDriver::FromWebContents(web_contents_.get())) {
-    AwAutofillManagerDelegate::FromWebContents(web_contents_.get())->
+    AwAutofillClient::FromWebContents(web_contents_.get())->
         SetSaveFormData(enabled);
   }
 }
@@ -242,21 +242,21 @@ void AwContents::InitAutofillIfNecessary(bool enabled) {
 
   AwBrowserContext::FromWebContents(web_contents)->
       CreateUserPrefServiceIfNecessary();
-  AwAutofillManagerDelegate::CreateForWebContents(web_contents);
+  AwAutofillClient::CreateForWebContents(web_contents);
   ContentAutofillDriver::CreateForWebContentsAndDelegate(
       web_contents,
-      AwAutofillManagerDelegate::FromWebContents(web_contents),
+      AwAutofillClient::FromWebContents(web_contents),
       l10n_util::GetDefaultLocale(),
       AutofillManager::DISABLE_AUTOFILL_DOWNLOAD_MANAGER);
 }
 
-void AwContents::SetAwAutofillManagerDelegate(jobject delegate) {
+void AwContents::SetAwAutofillClient(jobject client) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return;
-  Java_AwContents_setAwAutofillManagerDelegate(env, obj.obj(), delegate);
+  Java_AwContents_setAwAutofillClient(env, obj.obj(), client);
 }
 
 AwContents::~AwContents() {