Rename AutofillManagerDelegate to AutofillClient.

chrome/browser/autofill/content_autofill_driver_browsertest.cc

 // Copyright 2014 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.
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "components/autofill/content/browser/content_autofill_driver.h"
 #include "components/autofill/core/browser/autofill_manager.h"
-#include "components/autofill/core/browser/test_autofill_manager_delegate.h"
+#include "components/autofill/core/browser/test_autofill_client.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/rect.h"
 
 namespace autofill {
 namespace {
 
-class MockAutofillManagerDelegate
-    : public autofill::TestAutofillManagerDelegate {
+class MockAutofillClient : public TestAutofillClient {
  public:
-  MockAutofillManagerDelegate() {}
-  virtual ~MockAutofillManagerDelegate() {}
+  MockAutofillClient() {}
+  virtual ~MockAutofillClient() {}
 
   virtual PrefService* GetPrefs() { return &prefs_; }
 
   user_prefs::PrefRegistrySyncable* GetPrefRegistry() {
     return prefs_.registry();
   }
 
   MOCK_METHOD7(ShowAutofillPopup,
                void(const gfx::RectF& element_bounds,
                     base::i18n::TextDirection text_direction,
                     const std::vector<base::string16>& values,
                     const std::vector<base::string16>& labels,
                     const std::vector<base::string16>& icons,
                     const std::vector<int>& identifiers,
                     base::WeakPtr<AutofillPopupDelegate> delegate));
 
   MOCK_METHOD0(HideAutofillPopup, void());
 
  private:
   TestingPrefServiceSyncable prefs_;
 
-  DISALLOW_COPY_AND_ASSIGN(MockAutofillManagerDelegate);
+  DISALLOW_COPY_AND_ASSIGN(MockAutofillClient);
 };
 
 // Subclass ContentAutofillDriver so we can create an ContentAutofillDriver
 // instance.
 class TestContentAutofillDriver : public ContentAutofillDriver {
  public:
   TestContentAutofillDriver(content::WebContents* web_contents,
-                            AutofillManagerDelegate* delegate)
+                            AutofillClient* client)
       : ContentAutofillDriver(
             web_contents,
-            delegate,
+            client,
             g_browser_process->GetApplicationLocale(),
             AutofillManager::ENABLE_AUTOFILL_DOWNLOAD_MANAGER) {}
   virtual ~TestContentAutofillDriver() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestContentAutofillDriver);
 };
 
 }  // namespace
 
 class ContentAutofillDriverBrowserTest : public InProcessBrowserTest,
                                          public content::WebContentsObserver {
  public:
   ContentAutofillDriverBrowserTest() {}
   virtual ~ContentAutofillDriverBrowserTest() {}
 
   virtual void SetUpOnMainThread() OVERRIDE {
     content::WebContents* web_contents =
         browser()->tab_strip_model()->GetActiveWebContents();
     ASSERT_TRUE(web_contents != NULL);
     Observe(web_contents);
-    AutofillManager::RegisterProfilePrefs(manager_delegate_.GetPrefRegistry());
+    AutofillManager::RegisterProfilePrefs(autofill_client_.GetPrefRegistry());
 
     autofill_driver_.reset(
-        new TestContentAutofillDriver(web_contents, &manager_delegate_));
+        new TestContentAutofillDriver(web_contents, &autofill_client_));
   }
 
   // Normally the WebContents will automatically delete the driver, but here
   // the driver is owned by this test, so we have to manually destroy.
   virtual void WebContentsDestroyed() OVERRIDE {
     autofill_driver_.reset();
   }
 
   virtual void WasHidden() OVERRIDE {
     if (!web_contents_hidden_callback_.is_null())
       web_contents_hidden_callback_.Run();
   }
 
   virtual void NavigationEntryCommitted(
       const content::LoadCommittedDetails& load_details) OVERRIDE {
     if (!nav_entry_committed_callback_.is_null())
       nav_entry_committed_callback_.Run();
   }
 
  protected:
   content::WebContents* web_contents_;
 
   base::Closure web_contents_hidden_callback_;
   base::Closure nav_entry_committed_callback_;
 
-  testing::NiceMock<MockAutofillManagerDelegate> manager_delegate_;
+  testing::NiceMock<MockAutofillClient> autofill_client_;
   scoped_ptr<TestContentAutofillDriver> autofill_driver_;
 };
 
 IN_PROC_BROWSER_TEST_F(ContentAutofillDriverBrowserTest,
                        SwitchTabAndHideAutofillPopup) {
   // Notification is different on platforms. On linux this will be called twice,
   // while on windows only once.
-  EXPECT_CALL(manager_delegate_, HideAutofillPopup())
-      .Times(testing::AtLeast(1));
+  EXPECT_CALL(autofill_client_, HideAutofillPopup()).Times(testing::AtLeast(1));
 
   scoped_refptr<content::MessageLoopRunner> runner =
       new content::MessageLoopRunner;
   web_contents_hidden_callback_ = runner->QuitClosure();
   chrome::AddSelectedTabWithURL(browser(),
                                 GURL(content::kAboutBlankURL),
                                 content::PAGE_TRANSITION_AUTO_TOPLEVEL);
   runner->Run();
   web_contents_hidden_callback_.Reset();
 }
 
 IN_PROC_BROWSER_TEST_F(ContentAutofillDriverBrowserTest,
                        TestPageNavigationHidingAutofillPopup) {
   // Notification is different on platforms. On linux this will be called twice,
   // while on windows only once.
-  EXPECT_CALL(manager_delegate_, HideAutofillPopup())
-      .Times(testing::AtLeast(1));
+  EXPECT_CALL(autofill_client_, HideAutofillPopup()).Times(testing::AtLeast(1));
 
   scoped_refptr<content::MessageLoopRunner> runner =
       new content::MessageLoopRunner;
   nav_entry_committed_callback_ = runner->QuitClosure();
   browser()->OpenURL(content::OpenURLParams(GURL(chrome::kChromeUIBookmarksURL),
                                             content::Referrer(),
                                             CURRENT_TAB,
                                             content::PAGE_TRANSITION_TYPED,
                                             false));
   browser()->OpenURL(content::OpenURLParams(GURL(chrome::kChromeUIAboutURL),
                                             content::Referrer(),
                                             CURRENT_TAB,
                                             content::PAGE_TRANSITION_TYPED,
                                             false));
   runner->Run();
   nav_entry_committed_callback_.Reset();
 }
 
 }  // namespace autofill