Rename AutofillManagerDelegate to AutofillClient.

Rename AutofillManagerDelegate to AutofillClient.

"Client" rather than "Delegate" is the canonical name for embedder delegate
interfaces.

Also renames TabAutofillManagerDelegate to ChromeAutofillClient.

BUG=none
TEST=compiles
R=blundell@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=275612

[Ilya Sherman, 2014-05-31 01:46:22]

Erm, I missed some steps.  Will have a new patch set up soon...

[Ilya Sherman, 2014-05-31 03:16:37]

On 2014/05/31 01:46:22, Ilya Sherman wrote:
> Erm, I missed some steps.  Will have a new patch set up soon...

Hokay, ready now.  Whew, that was more manual work than I'd anticipated :/

[blundell, 2014-06-02 09:04:14]

Thanks for doing this! I think it should be called AutofillClient as it's really
a client for the entire Autofill component, not just AutofillManager. WDYT?

[Ilya Sherman, 2014-06-03 01:14:32]

On 2014/06/02 09:04:14, blundell wrote:
> Thanks for doing this! I think it should be called AutofillClient as it's
really
> a client for the entire Autofill component, not just AutofillManager. WDYT?

Aight.

[blundell, 2014-06-03 08:27:10]

LGTM, thanks! Great cleanup.

https://codereview.chromium.org/306053008/diff/80001/components/autofill/core...
File components/autofill/core/browser/autofill_client.h (right):

https://codereview.chromium.org/306053008/diff/80001/components/autofill/core...
components/autofill/core/browser/autofill_client.h:36: // A delegate interface
that needs to be supplied to AutofillManager
s/delegate/client throughout this comment

[Ilya Sherman, 2014-06-03 20:25:43]

https://codereview.chromium.org/306053008/diff/80001/components/autofill/core...
File components/autofill/core/browser/autofill_client.h (right):

https://codereview.chromium.org/306053008/diff/80001/components/autofill/core...
components/autofill/core/browser/autofill_client.h:36: // A delegate interface
that needs to be supplied to AutofillManager
On 2014/06/03 08:27:11, blundell wrote:
> s/delegate/client throughout this comment

Done.

[Ilya Sherman, 2014-06-03 20:28:56]

+michaelbai@ for android_webview changes.
+Lei for //chrome changes outside of files in "autofill" directories.

[Lei Zhang, 2014-06-03 21:31:03]

On 2014/06/03 20:28:56, Ilya Sherman wrote:
> +Lei for //chrome changes outside of files in "autofill" directories.

lgtm

[michaelbai, 2014-06-03 21:45:26]

Was android_webview/native/aw_autofill_manager_delegate.h deleted? why it shows
as 'M' not 'D'

[Ilya Sherman, 2014-06-03 21:47:48]

On 2014/06/03 21:45:26, michaelbai wrote:
> Was android_webview/native/aw_autofill_manager_delegate.h deleted? why it
shows
> as 'M' not 'D'

It was deleted, yes.  My theory is that the 'M' vs. 'D' is a git oddity of some
sort.

[michaelbai, 2014-06-03 21:54:56]

lgtm

[Ilya Sherman, 2014-06-03 21:59:25]

The CQ bit was checked by isherman@chromium.org

[commit-bot: I haz the power, 2014-06-03 22:01:30]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/isherman@chromium.org/306053008/120001

[commit-bot: I haz the power, 2014-06-03 23:58:08]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  android_dbg_triggered_tests on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_dbg_triggered...)

[Ilya Sherman, 2014-06-04 22:41:24]

The CQ bit was checked by isherman@chromium.org

[commit-bot: I haz the power, 2014-06-04 22:43:13]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/isherman@chromium.org/306053008/120001

[commit-bot: I haz the power, 2014-06-04 22:45:53]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-06-04 22:45:54]

Failed to apply patch for chrome/browser/ui/tab_helpers.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/ui/tab_helpers.cc
  Hunk #1 FAILED at 18.
  1 out of 2 hunks FAILED -- saving rejects to file
chrome/browser/ui/tab_helpers.cc.rej

Patch:       chrome/browser/ui/tab_helpers.cc
Index: chrome/browser/ui/tab_helpers.cc
diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
index
abdad8551ca900920d5002e1425914363281e65f..28e05cbf8d3939ffed179e45f8aafb214919d87b
100644
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -18,7 +18,7 @@
 #include "chrome/browser/ssl/ssl_tab_helper.h"
 #include "chrome/browser/tab_contents/navigation_metrics_recorder.h"
 #include "chrome/browser/translate/translate_tab_helper.h"
-#include "chrome/browser/ui/autofill/tab_autofill_manager_delegate.h"
+#include "chrome/browser/ui/autofill/chrome_autofill_client.h"
 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
@@ -113,17 +113,17 @@ void TabHelpers::AttachTabHelpers(WebContents*
web_contents) {
 
   // --- Common tab helpers ---
 
-  autofill::TabAutofillManagerDelegate::CreateForWebContents(web_contents);
+  autofill::ChromeAutofillClient::CreateForWebContents(web_contents);
   autofill::ContentAutofillDriver::CreateForWebContentsAndDelegate(
       web_contents,
-      autofill::TabAutofillManagerDelegate::FromWebContents(web_contents),
+      autofill::ChromeAutofillClient::FromWebContents(web_contents),
       g_browser_process->GetApplicationLocale(),
       autofill::AutofillManager::ENABLE_AUTOFILL_DOWNLOAD_MANAGER);
   BookmarkTabHelper::CreateForWebContents(web_contents);
   chrome_browser_net::NetErrorTabHelper::CreateForWebContents(web_contents);
-  ChromePasswordManagerClient::CreateForWebContentsWithAutofillManagerDelegate(
+  ChromePasswordManagerClient::CreateForWebContentsWithAutofillClient(
       web_contents,
-      autofill::TabAutofillManagerDelegate::FromWebContents(web_contents));
+      autofill::ChromeAutofillClient::FromWebContents(web_contents));
   CoreTabHelper::CreateForWebContents(web_contents);
   extensions::TabHelper::CreateForWebContents(web_contents);
   FaviconTabHelper::CreateForWebContents(web_contents);

[Ilya Sherman, 2014-06-04 23:10:29]

The CQ bit was checked by isherman@chromium.org

[commit-bot: I haz the power, 2014-06-04 23:12:45]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/isherman@chromium.org/306053008/140001

[commit-bot: I haz the power, 2014-06-05 03:20:12]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  android_chromium_gn_compile_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_chromium_gn_c...)
  linux_chromium_gn_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_gn_rel...)

[commit-bot: I haz the power, 2014-06-05 03:27:40]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-06-05 03:27:40]

Try jobs failed on following builders:
  android_chromium_gn_compile_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_chromium_gn_c...)
  linux_chromium_gn_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_gn_rel...)

[Ilya Sherman, 2014-06-05 04:01:41]

The CQ bit was checked by isherman@chromium.org

[commit-bot: I haz the power, 2014-06-05 04:02:17]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/isherman@chromium.org/306053008/140001

[commit-bot: I haz the power, 2014-06-05 04:09:26]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  android_chromium_gn_compile_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_chromium_gn_c...)
  linux_chromium_gn_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_gn_rel...)

[commit-bot: I haz the power, 2014-06-05 04:10:57]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-06-05 04:10:57]

Try jobs failed on following builders:
  android_chromium_gn_compile_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_chromium_gn_c...)

[Ilya Sherman, 2014-06-06 04:20:09]

The CQ bit was checked by isherman@chromium.org

[commit-bot: I haz the power, 2014-06-06 04:21:39]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/isherman@chromium.org/306053008/140001

[commit-bot: I haz the power, 2014-06-06 04:27:04]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  android_chromium_gn_compile_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_chromium_gn_c...)
  linux_chromium_gn_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_gn_rel...)

[commit-bot: I haz the power, 2014-06-06 04:31:20]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-06-06 04:31:22]

Try jobs failed on following builders:
  android_chromium_gn_compile_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_chromium_gn_c...)
  linux_chromium_gn_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_gn_rel...)

[Ilya Sherman, 2014-06-06 05:12:52]

The CQ bit was checked by isherman@chromium.org

[commit-bot: I haz the power, 2014-06-06 05:15:15]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/isherman@chromium.org/306053008/160001

[commit-bot: I haz the power, 2014-06-06 09:44:19]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  android_dbg_triggered_tests on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_dbg_triggered...)

[commit-bot: I haz the power, 2014-06-06 11:42:51]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-06-06 11:42:52]

Failed to apply patch for
components/autofill/core/browser/autofill_manager_unittest.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file components/autofill/core/browser/autofill_manager_unittest.cc
  Hunk #6 FAILED at 1551.
  Hunk #7 succeeded at 2313 (offset 6 lines).
  Hunk #8 succeeded at 2338 (offset 6 lines).
  Hunk #9 succeeded at 2477 with fuzz 1 (offset 6 lines).
  Hunk #10 succeeded at 2837 (offset 6 lines).
  Hunk #11 succeeded at 2860 (offset 6 lines).
  1 out of 11 hunks FAILED -- saving rejects to file
components/autofill/core/browser/autofill_manager_unittest.cc.rej

Patch:       components/autofill/core/browser/autofill_manager_unittest.cc
Index: components/autofill/core/browser/autofill_manager_unittest.cc
diff --git a/components/autofill/core/browser/autofill_manager_unittest.cc
b/components/autofill/core/browser/autofill_manager_unittest.cc
index
4e3fd92cd8aca8d71cf028bcbf134a0c67d6b1af..731e58ad53ed8c7472da71619b889956475a6688
100644
--- a/components/autofill/core/browser/autofill_manager_unittest.cc
+++ b/components/autofill/core/browser/autofill_manager_unittest.cc
@@ -27,9 +27,9 @@
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/autofill/core/browser/popup_item_ids.h"
+#include "components/autofill/core/browser/test_autofill_client.h"
 #include "components/autofill/core/browser/test_autofill_driver.h"
 #include "components/autofill/core/browser/test_autofill_external_delegate.h"
-#include "components/autofill/core/browser/test_autofill_manager_delegate.h"
 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/autofill/core/common/form_data.h"
@@ -359,9 +359,8 @@ void ExpectFilledCreditCardYearMonthWithYearMonth(int
page_id,
 
 class MockAutocompleteHistoryManager : public AutocompleteHistoryManager {
  public:
-  MockAutocompleteHistoryManager(AutofillDriver* driver,
-                                 AutofillManagerDelegate* delegate)
-      : AutocompleteHistoryManager(driver, delegate) {}
+  MockAutocompleteHistoryManager(AutofillDriver* driver, AutofillClient*
client)
+      : AutocompleteHistoryManager(driver, client) {}
 
   MOCK_METHOD1(OnFormSubmitted, void(const FormData& form));
 
@@ -385,9 +384,9 @@ class MockAutofillDriver : public TestAutofillDriver {
 class TestAutofillManager : public AutofillManager {
  public:
   TestAutofillManager(AutofillDriver* driver,
-                      autofill::AutofillManagerDelegate* delegate,
+                      autofill::AutofillClient* client,
                       TestPersonalDataManager* personal_data)
-      : AutofillManager(driver, delegate, personal_data),
+      : AutofillManager(driver, client, personal_data),
         personal_data_(personal_data),
         autofill_enabled_(true) {}
   virtual ~TestAutofillManager() {}
@@ -587,12 +586,12 @@ class TestAutofillExternalDelegate : public
AutofillExternalDelegate {
 class AutofillManagerTest : public testing::Test {
  public:
   virtual void SetUp() OVERRIDE {
-    autofill_delegate_.SetPrefs(test::PrefServiceForTesting());
-    personal_data_.set_database(autofill_delegate_.GetDatabase());
-    personal_data_.SetPrefService(autofill_delegate_.GetPrefs());
+    autofill_client_.SetPrefs(test::PrefServiceForTesting());
+    personal_data_.set_database(autofill_client_.GetDatabase());
+    personal_data_.SetPrefService(autofill_client_.GetPrefs());
     autofill_driver_.reset(new MockAutofillDriver());
     autofill_manager_.reset(new TestAutofillManager(
-        autofill_driver_.get(), &autofill_delegate_, &personal_data_));
+        autofill_driver_.get(), &autofill_client_, &personal_data_));
 
     external_delegate_.reset(new TestAutofillExternalDelegate(
         autofill_manager_.get(),
@@ -674,7 +673,7 @@ class AutofillManagerTest : public testing::Test {
 
  protected:
   base::MessageLoop message_loop_;
-  TestAutofillManagerDelegate autofill_delegate_;
+  TestAutofillClient autofill_client_;
   scoped_ptr<MockAutofillDriver> autofill_driver_;
   scoped_ptr<TestAutofillManager> autofill_manager_;
   scoped_ptr<TestAutofillExternalDelegate> external_delegate_;
@@ -1552,7 +1551,7 @@ TEST_F(AutofillManagerTest, FillAddressForm) {
 // Test that we correctly fill an address form from an auxiliary profile.
 TEST_F(AutofillManagerTest, FillAddressFormFromAuxiliaryProfile) {
   personal_data_.ClearAutofillProfiles();
-  autofill_delegate_.GetPrefs()->SetBoolean(
+  autofill_client_.GetPrefs()->SetBoolean(
       ::autofill::prefs::kAutofillAuxiliaryProfilesEnabled, true);
   personal_data_.CreateTestAuxiliaryProfiles();
 
@@ -2308,15 +2307,13 @@ TEST_F(AutofillManagerTest, FormSubmitted) {
 // Test that when Autocomplete is enabled and Autofill is disabled,
 // form submissions are still received by AutocompleteHistoryManager.
 TEST_F(AutofillManagerTest, FormSubmittedAutocompleteEnabled) {
-  TestAutofillManagerDelegate delegate;
-  autofill_manager_.reset(new TestAutofillManager(
-      autofill_driver_.get(),
-      &delegate,
-      NULL));
+  TestAutofillClient client;
+  autofill_manager_.reset(
+      new TestAutofillManager(autofill_driver_.get(), &client, NULL));
   autofill_manager_->set_autofill_enabled(false);
   scoped_ptr<MockAutocompleteHistoryManager> autocomplete_history_manager;
   autocomplete_history_manager.reset(
-      new MockAutocompleteHistoryManager(autofill_driver_.get(), &delegate));
+      new MockAutocompleteHistoryManager(autofill_driver_.get(), &client));
   autofill_manager_->autocomplete_history_manager_ =
       autocomplete_history_manager.Pass();
 
@@ -2335,11 +2332,9 @@ TEST_F(AutofillManagerTest,
FormSubmittedAutocompleteEnabled) {
 // Test that when Autocomplete is enabled and Autofill is disabled,
 // Autocomplete suggestions are still received.
 TEST_F(AutofillManagerTest, AutocompleteSuggestionsWhenAutofillDisabled) {
-  TestAutofillManagerDelegate delegate;
-  autofill_manager_.reset(new TestAutofillManager(
-      autofill_driver_.get(),
-      &delegate,
-      NULL));
+  TestAutofillClient client;
+  autofill_manager_.reset(
+      new TestAutofillManager(autofill_driver_.get(), &client, NULL));
   autofill_manager_->set_autofill_enabled(false);
   autofill_manager_->SetExternalDelegate(external_delegate_.get());
 
@@ -2476,7 +2471,7 @@ TEST_F(AutofillManagerTest,
FormSubmittedWithDefaultValues) {
 // Checks that resetting the auxiliary profile enabled preference does the
right
 // thing on all platforms.
 TEST_F(AutofillManagerTest, AuxiliaryProfilesReset) {
-  PrefService* prefs = autofill_delegate_.GetPrefs();
+  PrefService* prefs = autofill_client_.GetPrefs();
 #if defined(OS_MACOSX) || defined(OS_ANDROID)
   // Auxiliary profiles is implemented on Mac and Android only.
   // OSX: enables Mac Address Book integration.
@@ -2836,11 +2831,11 @@ TEST_F(AutofillManagerTest, RemoveProfileVariant) {
 
 namespace {
 
-class MockAutofillManagerDelegate : public TestAutofillManagerDelegate {
+class MockAutofillClient : public TestAutofillClient {
  public:
-  MockAutofillManagerDelegate() {}
+  MockAutofillClient() {}
 
-  virtual ~MockAutofillManagerDelegate() {}
+  virtual ~MockAutofillClient() {}
 
   virtual void ShowRequestAutocompleteDialog(
       const FormData& form,
@@ -2859,7 +2854,7 @@ class MockAutofillManagerDelegate : public
TestAutofillManagerDelegate {
  private:
   scoped_ptr<FormStructure> user_supplied_data_;
 
-  DISALLOW_COPY_AND_ASSIGN(MockAutofillManagerDelegate);
+  DISALLOW_COPY_AND_ASSIGN(MockAutofillClient);
 };
 
 }  // namespace

[Ilya Sherman, 2014-06-06 23:39:29]

The CQ bit was checked by isherman@chromium.org

[commit-bot: I haz the power, 2014-06-06 23:40:33]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/isherman@chromium.org/306053008/180001

[commit-bot: I haz the power, 2014-06-07 04:37:03]

Change committed as 275612