Rename AutofillManagerDelegate to AutofillClient.

components/autofill/content/browser/content_autofill_driver.cc

 // Copyright 2014 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 "components/autofill/content/browser/content_autofill_driver.h"
 
 #include "base/command_line.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "components/autofill/content/common/autofill_messages.h"
+#include "components/autofill/core/browser/autofill_client.h"
 #include "components/autofill/core/browser/autofill_external_delegate.h"
 #include "components/autofill/core/browser/autofill_manager.h"
-#include "components/autofill/core/browser/autofill_manager_delegate.h"
 #include "components/autofill/core/browser/form_structure.h"
 #include "components/autofill/core/common/autofill_switches.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/frame_navigate_params.h"
 #include "ipc/ipc_message_macros.h"
 
 namespace autofill {
 
 namespace {
 
 const char kContentAutofillDriverWebContentsUserDataKey[] =
     "web_contents_autofill_driver_impl";
 
 }  // namespace
 
 // static
 void ContentAutofillDriver::CreateForWebContentsAndDelegate(
     content::WebContents* contents,
-    autofill::AutofillManagerDelegate* delegate,
+    AutofillClient* client,
     const std::string& app_locale,
     AutofillManager::AutofillDownloadManagerState enable_download_manager) {
   if (FromWebContents(contents))
     return;
 
   contents->SetUserData(
       kContentAutofillDriverWebContentsUserDataKey,
       new ContentAutofillDriver(
-          contents, delegate, app_locale, enable_download_manager));
+          contents, client, app_locale, enable_download_manager));
 }
 
 // static
 ContentAutofillDriver* ContentAutofillDriver::FromWebContents(
     content::WebContents* contents) {
   return static_cast<ContentAutofillDriver*>(
       contents->GetUserData(kContentAutofillDriverWebContentsUserDataKey));
 }
 
 ContentAutofillDriver::ContentAutofillDriver(
     content::WebContents* web_contents,
-    autofill::AutofillManagerDelegate* delegate,
+    AutofillClient* client,
     const std::string& app_locale,
     AutofillManager::AutofillDownloadManagerState enable_download_manager)
     : content::WebContentsObserver(web_contents),
       autofill_manager_(new AutofillManager(this,
-                                            delegate,
+                                            client,
                                             app_locale,
                                             enable_download_manager)),
       autofill_external_delegate_(autofill_manager_.get(), this),
       request_autocomplete_manager_(this) {
   autofill_manager_->SetExternalDelegate(&autofill_external_delegate_);
 }
 
 ContentAutofillDriver::~ContentAutofillDriver() {}
 
 bool ContentAutofillDriver::IsOffTheRecord() const {
@@ skipping 139 matching lines @@
 }
 
 void ContentAutofillDriver::SetAutofillManager(
     scoped_ptr<AutofillManager> manager) {
   autofill_manager_ = manager.Pass();
   autofill_manager_->SetExternalDelegate(&autofill_external_delegate_);
 }
 
 void ContentAutofillDriver::NavigationEntryCommitted(
     const content::LoadCommittedDetails& load_details) {
-  autofill_manager_->delegate()->HideAutofillPopup();
+  autofill_manager_->client()->HideAutofillPopup();
 }
 
 void ContentAutofillDriver::WasHidden() {
-  autofill_manager_->delegate()->HideAutofillPopup();
+  autofill_manager_->client()->HideAutofillPopup();
 }
 
 }  // namespace autofill