Rename AutofillManagerDelegate to AutofillClient.

chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc

Index: chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
index 1ebd14e42d519207cc9e2369bd7e43fa1161ec47..21ec3d1431541cb8c3000a462036fdc94a8a7ba3 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
@@ -18,9 +18,9 @@
 #include "chrome/browser/ui/autofill/autofill_dialog_i18n_input.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_view.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_view_tester.h"
+#include "chrome/browser/ui/autofill/chrome_autofill_client.h"
 #include "chrome/browser/ui/autofill/data_model_wrapper.h"
 #include "chrome/browser/ui/autofill/mock_address_validator.h"
-#include "chrome/browser/ui/autofill/tab_autofill_manager_delegate.h"
 #include "chrome/browser/ui/autofill/test_generated_credit_card_bubble_controller.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
@@ -83,9 +83,10 @@ using testing::Return;
 using testing::_;
 using ::i18n::addressinput::AddressValidator;
 
-void MockCallback(AutofillManagerDelegate::RequestAutocompleteResult,
+void MockCallback(AutofillClient::RequestAutocompleteResult,
                   const base::string16& message,
-                  const FormStructure*) {}
+                  const FormStructure*) {
+}
 
 class MockAutofillMetrics : public AutofillMetrics {
  public:
@@ -403,9 +404,9 @@ class AutofillDialogControllerTest : public InProcessBrowserTest {
   AutofillDialogControllerImpl* SetUpHtmlAndInvoke(
       const std::string& form_inner_html) {
     content::WebContents* contents = GetActiveWebContents();
-    TabAutofillManagerDelegate* delegate =
-        TabAutofillManagerDelegate::FromWebContents(contents);
-    CHECK(!delegate->GetDialogControllerForTesting());
+    ChromeAutofillClient* client =
+        ChromeAutofillClient::FromWebContents(contents);
+    CHECK(!client->GetDialogControllerForTesting());
 
     ui_test_utils::NavigateToURL(
         browser(), GURL(std::string("data:text/html,") +
@@ -462,7 +463,7 @@ class AutofillDialogControllerTest : public InProcessBrowserTest {
     InitiateDialog();
     AutofillDialogControllerImpl* controller =
         static_cast<AutofillDialogControllerImpl*>(
-            delegate->GetDialogControllerForTesting());
+            client->GetDialogControllerForTesting());
     return controller;
   }
 
@@ -488,11 +489,11 @@ class AutofillDialogControllerTest : public InProcessBrowserTest {
 
     InitiateDialog();
 
-    TabAutofillManagerDelegate* delegate =
-        TabAutofillManagerDelegate::FromWebContents(contents);
+    ChromeAutofillClient* client =
+        ChromeAutofillClient::FromWebContents(contents);
     AutofillDialogControllerImpl* controller =
         static_cast<AutofillDialogControllerImpl*>(
-            delegate->GetDialogControllerForTesting());
+            client->GetDialogControllerForTesting());
     return !!controller;
   }
 
@@ -1422,8 +1423,8 @@ IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, RefreshOnManageTabClose) {
       wallet::GetTestWalletItems(wallet::AMEX_DISALLOWED));
 
   content::WebContents* dialog_invoker = controller()->GetWebContents();
-  TabAutofillManagerDelegate::FromWebContents(dialog_invoker)->
-      SetDialogControllerForTesting(controller()->AsWeakPtr());
+  ChromeAutofillClient::FromWebContents(dialog_invoker)
+      ->SetDialogControllerForTesting(controller()->AsWeakPtr());
 
   // Open a new tab by selecting "Manage my shipping details..." in Wallet mode.
   EXPECT_EQ(1, browser()->tab_strip_model()->count());