Rename AutofillManagerDelegate to AutofillClient.

android_webview/native/aw_contents.cc

 // Copyright 2012 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_contents.h"
 
 #include <limits>
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_browser_main_parts.h"
 #include "android_webview/browser/aw_resource_context.h"
 #include "android_webview/browser/browser_view_renderer.h"
 #include "android_webview/browser/deferred_gpu_command_service.h"
 #include "android_webview/browser/gpu_memory_buffer_factory_impl.h"
 #include "android_webview/browser/hardware_renderer.h"
 #include "android_webview/browser/hardware_renderer_legacy.h"
 #include "android_webview/browser/net_disk_cache_remover.h"
 #include "android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h"
 #include "android_webview/browser/scoped_app_gl_state_restore.h"
 #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"
 #include "android_webview/native/aw_pdf_exporter.h"
 #include "android_webview/native/aw_picture.h"
 #include "android_webview/native/aw_web_contents_delegate.h"
 #include "android_webview/native/java_browser_view_renderer_helper.h"
 #include "android_webview/native/permission/aw_permission_request.h"
 #include "android_webview/native/permission/permission_request_handler.h"
 #include "android_webview/native/state_serializer.h"
@@ skipping 133 matching lines @@
   icon_helper_.reset(new IconHelper(web_contents_.get()));
   icon_helper_->SetListener(this);
   web_contents_->SetUserData(kAwContentsUserDataKey,
                              new AwContentsUserData(this));
   render_view_host_ext_.reset(
       new AwRenderViewHostExt(this, web_contents_.get()));
 
   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());
 }
 
 void AwContents::SetJavaPeers(JNIEnv* env,
                               jobject obj,
                               jobject aw_contents,
                               jobject web_contents_delegate,
                               jobject contents_client_bridge,
@@ skipping 24 matching lines @@
   // Finally, having setup the associations, release any deferred requests
   web_contents_->ForEachFrame(base::Bind(&OnIoThreadClientReady));
 }
 
 void AwContents::SetSaveFormData(bool enabled) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   InitAutofillIfNecessary(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);
   }
 }
 
 void AwContents::InitDataReductionProxyIfNecessary() {
   AwBrowserContext* browser_context =
       AwBrowserContext::FromWebContents(web_contents_.get());
   browser_context->CreateUserPrefServiceIfNecessary();
 }
 
 void AwContents::InitAutofillIfNecessary(bool enabled) {
   // Do not initialize if the feature is not enabled.
   if (!enabled)
     return;
   // Check if the autofill driver already exists.
   content::WebContents* web_contents = web_contents_.get();
   if (ContentAutofillDriver::FromWebContents(web_contents))
     return;
 
   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() {
   DCHECK(AwContents::FromWebContents(web_contents_.get()) == this);
   DCHECK(!hardware_renderer_.get());
   web_contents_->RemoveUserData(kAwContentsUserDataKey);
   if (find_helper_.get())
     find_helper_->SetListener(NULL);
   if (icon_helper_.get())
     icon_helper_->SetListener(NULL);
@@ skipping 825 matching lines @@
     return;
 
   browser_view_renderer_.TrimMemory(level, visible);
 }
 
 void SetShouldDownloadFavicons(JNIEnv* env, jclass jclazz) {
   g_should_download_favicons = true;
 }
 
 }  // namespace android_webview