Rename AutofillManagerDelegate to AutofillClient.

components/autofill/core/browser/autofill_manager.h

 // Copyright 2013 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.
 
 #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_MANAGER_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_MANAGER_H_
 
 #include <list>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #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"
 
 class GURL;
 
 namespace content {
 class RenderViewHost;
 class WebContents;
 }
 
 namespace gfx {
 class Rect;
 class RectF;
 }
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
 namespace autofill {
 
 class AutofillDataModel;
 class AutofillDownloadManager;
 class AutofillExternalDelegate;
 class AutofillField;
-class AutofillManagerDelegate;
+class AutofillClient;
 class AutofillManagerTestDelegate;
 class AutofillMetrics;
 class AutofillProfile;
 class AutofillType;
 class CreditCard;
 class FormStructureBrowserTest;
 
 struct FormData;
 struct FormFieldData;
 struct PasswordFormFillData;
 
 // Manages saving and restoring the user's personal information entered into web
 // forms.
 class AutofillManager : public AutofillDownloadManager::Observer {
  public:
   enum AutofillDownloadManagerState {
     ENABLE_AUTOFILL_DOWNLOAD_MANAGER,
     DISABLE_AUTOFILL_DOWNLOAD_MANAGER,
   };
 
   // Registers our Enable/Disable Autofill pref.
   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();
 
   // Sets an external delegate.
   void SetExternalDelegate(AutofillExternalDelegate* delegate);
 
   void ShowAutofillSettings();
 
   // Called from our external delegate so they cannot be private.
@@ skipping 13 matching lines @@
   // Remove the specified Autocomplete entry.
   void RemoveAutocompleteEntry(const base::string16& name,
                                const base::string16& value);
 
   // Returns the present form structures seen by Autofill manager.
   const std::vector<FormStructure*>& GetFormStructures();
 
   // 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);
 
   // Processes the submitted |form|, saving any new Autofill data and uploading
   // the possible field types for the submitted fields to the crowdsourcing
   // server.  Returns false if this form is not relevant for Autofill.
   bool OnFormSubmitted(const FormData& form,
                        const base::TimeTicks& timestamp);
 
@@ skipping 24 matching lines @@
 
   // Resets cache.
   virtual void Reset();
 
   // Returns the value of the AutofillEnabled pref.
   virtual bool IsAutofillEnabled() const;
 
  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.
   virtual void UploadFormData(const FormStructure& submitted_form);
 
   // Logs quality metrics for the |submitted_form| and uploads the form data
   // to the crowdsourcing server, if appropriate.
   virtual void UploadFormDataAsyncCallback(
       const FormStructure* submitted_form,
       const base::TimeTicks& load_time,
@@ skipping 95 matching lines @@
   void UpdateInitialInteractionTimestamp(
       const base::TimeTicks& interaction_timestamp);
 
   // Shared code to determine if |form| should be uploaded.
   bool ShouldUploadForm(const FormStructure& form);
 
   // Provides driver-level context to the shared code of the component. Must
   // outlive this object.
   AutofillDriver* driver_;
 
-  autofill::AutofillManagerDelegate* const manager_delegate_;
+  AutofillClient* const client_;
 
   std::string app_locale_;
 
   // The personal data manager, used to save and load personal data to/from the
   // web database.  This is overridden by the AutofillManagerTest.
   // Weak reference.
   // May be NULL.  NULL indicates OTR.
   PersonalDataManager* personal_data_;
 
   std::list<std::string> autofilled_form_signatures_;
@@ skipping 31 matching lines @@
 
   // GUID to ID mapping.  We keep two maps to convert back and forth.
   mutable std::map<PersonalDataManager::GUIDPair, int> guid_id_map_;
   mutable std::map<int, PersonalDataManager::GUIDPair> id_guid_map_;
 
   // Delegate to perform external processing (display, selection) on
   // our behalf.  Weak.
   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,
                            DeterminePossibleFieldTypesForUploadStressTest);
   FRIEND_TEST_ALL_PREFIXES(AutofillManagerTest,
                            DisabledAutofillDispatchesError);
   FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest, AddressSuggestionsCount);
   FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest, AutofillIsEnabledAtPageLoad);
   FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest, DeveloperEngagement);
   FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest, FormFillDuration);
@@ skipping 10 matching lines @@
                            UserHappinessFormLoadAndSubmission);
   FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest, UserHappinessFormInteraction);
   FRIEND_TEST_ALL_PREFIXES(AutofillManagerTest,
                            FormSubmittedAutocompleteEnabled);
   DISALLOW_COPY_AND_ASSIGN(AutofillManager);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_MANAGER_H_