Rename AutofillManagerDelegate to AutofillClient.

components/autofill/core/browser/autofill_manager.h

Index: components/autofill/core/browser/autofill_manager.h
diff --git a/components/autofill/core/browser/autofill_manager.h b/components/autofill/core/browser/autofill_manager.h
index 856be0e989ba737b169f5ee3db628941cfe3cd1a..b179606dc7091e50f27269ab2b9d79f9fa5856d0 100644
--- a/components/autofill/core/browser/autofill_manager.h
+++ b/components/autofill/core/browser/autofill_manager.h
@@ -20,9 +20,9 @@
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "components/autofill/core/browser/autocomplete_history_manager.h"
+#include "components/autofill/core/browser/autofill_client.h"
 #include "components/autofill/core/browser/autofill_download.h"
 #include "components/autofill/core/browser/autofill_driver.h"
-#include "components/autofill/core/browser/autofill_manager_delegate.h"
 #include "components/autofill/core/browser/form_structure.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/autofill/core/common/form_data.h"
@@ -49,7 +49,7 @@ class AutofillDataModel;
 class AutofillDownloadManager;
 class AutofillExternalDelegate;
 class AutofillField;
-class AutofillManagerDelegate;
+class AutofillClient;
 class AutofillManagerTestDelegate;
 class AutofillMetrics;
 class AutofillProfile;
@@ -74,7 +74,7 @@ class AutofillManager : public AutofillDownloadManager::Observer {
   static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
 
   AutofillManager(AutofillDriver* driver,
-                  autofill::AutofillManagerDelegate* delegate,
+                  AutofillClient* client,
                   const std::string& app_locale,
                   AutofillDownloadManagerState enable_download_manager);
   virtual ~AutofillManager();
@@ -108,14 +108,12 @@ class AutofillManager : public AutofillDownloadManager::Observer {
   // Happens when the autocomplete dialog runs its callback when being closed.
   void RequestAutocompleteDialogClosed();
 
-  autofill::AutofillManagerDelegate* delegate() const {
-    return manager_delegate_;
-  }
+  AutofillClient* client() const { return client_; }
 
   const std::string& app_locale() const { return app_locale_; }
 
   // Only for testing.
-  void SetTestDelegate(autofill::AutofillManagerTestDelegate* delegate);
+  void SetTestDelegate(AutofillManagerTestDelegate* delegate);
 
   void OnFormsSeen(const std::vector<FormData>& forms,
                    const base::TimeTicks& timestamp);
@@ -160,7 +158,7 @@ class AutofillManager : public AutofillDownloadManager::Observer {
  protected:
   // Test code should prefer to use this constructor.
   AutofillManager(AutofillDriver* driver,
-                  autofill::AutofillManagerDelegate* delegate,
+                  AutofillClient* client,
                   PersonalDataManager* personal_data);
 
   // Uploads the form data to the Autofill server.
@@ -276,7 +274,7 @@ class AutofillManager : public AutofillDownloadManager::Observer {
   // outlive this object.
   AutofillDriver* driver_;
 
-  autofill::AutofillManagerDelegate* const manager_delegate_;
+  AutofillClient* const client_;
 
   std::string app_locale_;
 
@@ -328,12 +326,12 @@ class AutofillManager : public AutofillDownloadManager::Observer {
   AutofillExternalDelegate* external_delegate_;
 
   // Delegate used in test to get notifications on certain events.
-  autofill::AutofillManagerTestDelegate* test_delegate_;
+  AutofillManagerTestDelegate* test_delegate_;
 
   base::WeakPtrFactory<AutofillManager> weak_ptr_factory_;
 
   friend class AutofillManagerTest;
-  friend class autofill::FormStructureBrowserTest;
+  friend class FormStructureBrowserTest;
   FRIEND_TEST_ALL_PREFIXES(AutofillManagerTest,
                            DeterminePossibleFieldTypesForUpload);
   FRIEND_TEST_ALL_PREFIXES(AutofillManagerTest,