Rename AutofillManagerDelegate to AutofillClient.

chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc

Index: chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
index edaee4f0f3801e79775f503cc84e10107103eafd..ce0e728bd95a8ad6daa31d6a165fcf9538c7403d 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
@@ -667,11 +667,11 @@ bool CountryFilter(const std::set<base::string16>& possible_values,
 
 // static
 base::WeakPtr<AutofillDialogControllerImpl>
-    AutofillDialogControllerImpl::Create(
+AutofillDialogControllerImpl::Create(
     content::WebContents* contents,
     const FormData& form_structure,
     const GURL& source_url,
-    const AutofillManagerDelegate::ResultCallback& callback) {
+    const AutofillClient::ResultCallback& callback) {
   // AutofillDialogControllerImpl owns itself.
   AutofillDialogControllerImpl* autofill_dialog_controller =
       new AutofillDialogControllerImpl(contents,
@@ -711,7 +711,7 @@ base::WeakPtr<AutofillDialogController> AutofillDialogController::Create(
     content::WebContents* contents,
     const FormData& form_structure,
     const GURL& source_url,
-    const AutofillManagerDelegate::ResultCallback& callback) {
+    const AutofillClient::ResultCallback& callback) {
   return AutofillDialogControllerImpl::Create(contents,
                                               form_structure,
                                               source_url,
@@ -730,7 +730,7 @@ void AutofillDialogControllerImpl::Show() {
   // Fail if the author didn't specify autocomplete types.
   if (!has_types) {
     callback_.Run(
-        AutofillManagerDelegate::AutocompleteResultErrorDisabled,
+        AutofillClient::AutocompleteResultErrorDisabled,
         base::ASCIIToUTF16("Form is missing autocomplete attributes."),
         NULL);
     delete this;
@@ -749,11 +749,11 @@ void AutofillDialogControllerImpl::Show() {
   }
 
   if (!has_credit_card_field) {
-    callback_.Run(
-        AutofillManagerDelegate::AutocompleteResultErrorDisabled,
-        base::ASCIIToUTF16("Form is not a payment form (must contain "
-                           "some autocomplete=\"cc-*\" fields). "),
-        NULL);
+    callback_.Run(AutofillClient::AutocompleteResultErrorDisabled,
+                  base::ASCIIToUTF16(
+                      "Form is not a payment form (must contain "
+                      "some autocomplete=\"cc-*\" fields). "),
+                  NULL);
     delete this;
     return;
   }
@@ -2284,9 +2284,8 @@ bool AutofillDialogControllerImpl::OnCancel() {
   HidePopup();
   if (!is_submitting_)
     LogOnCancelMetrics();
-  callback_.Run(AutofillManagerDelegate::AutocompleteResultErrorCancel,
-                base::string16(),
-                NULL);
+  callback_.Run(
+      AutofillClient::AutocompleteResultErrorCancel, base::string16(), NULL);
   return true;
 }
 
@@ -2766,7 +2765,7 @@ AutofillDialogControllerImpl::AutofillDialogControllerImpl(
     content::WebContents* contents,
     const FormData& form_structure,
     const GURL& source_url,
-    const AutofillManagerDelegate::ResultCallback& callback)
+    const AutofillClient::ResultCallback& callback)
     : WebContentsObserver(contents),
       profile_(Profile::FromBrowserContext(contents->GetBrowserContext())),
       initial_user_state_(AutofillMetrics::DIALOG_USER_STATE_UNKNOWN),
@@ -3895,7 +3894,7 @@ void AutofillDialogControllerImpl::DoFinishSubmit() {
   LogOnFinishSubmitMetrics();
 
   // Callback should be called as late as possible.
-  callback_.Run(AutofillManagerDelegate::AutocompleteResultSuccess,
+  callback_.Run(AutofillClient::AutocompleteResultSuccess,
                 base::string16(),
                 &form_structure_);
   data_was_passed_back_ = true;