Rename AutofillManagerDelegate to AutofillClient.

chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc

 // Copyright (c) 2012 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 "base/memory/weak_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_popup_controller_impl.h"
 #include "chrome/browser/ui/autofill/autofill_popup_view.h"
 #include "chrome/browser/ui/autofill/popup_constants.h"
 #include "chrome/browser/ui/autofill/test_popup_controller_common.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/autofill/content/browser/content_autofill_driver.h"
 #include "components/autofill/core/browser/autofill_external_delegate.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #include "components/autofill/core/browser/autofill_test_utils.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_external_delegate.h"
-#include "components/autofill/core/browser/test_autofill_manager_delegate.h"
 #include "grit/component_scaled_resources.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/text_utils.h"
 
 using ::testing::_;
 using ::testing::AtLeast;
@@ skipping 14 matching lines @@
   virtual void DidSelectSuggestion(const base::string16& value,
                                    int identifier) OVERRIDE {}
   virtual void RemoveSuggestion(const base::string16& value,
                                 int identifier) OVERRIDE {}
   virtual void ClearPreviewedForm() OVERRIDE {}
   base::WeakPtr<AutofillExternalDelegate> GetWeakPtr() {
     return AutofillExternalDelegate::GetWeakPtr();
   }
 };
 
-class MockAutofillManagerDelegate
-    : public autofill::TestAutofillManagerDelegate {
+class MockAutofillClient : public autofill::TestAutofillClient {
  public:
-  MockAutofillManagerDelegate()
-      : prefs_(autofill::test::PrefServiceForTesting()) {
-  }
-  virtual ~MockAutofillManagerDelegate() {}
+  MockAutofillClient() : prefs_(autofill::test::PrefServiceForTesting()) {}
+  virtual ~MockAutofillClient() {}
 
   virtual PrefService* GetPrefs() OVERRIDE { return prefs_.get(); }
 
  private:
   scoped_ptr<PrefService> prefs_;
 
-  DISALLOW_COPY_AND_ASSIGN(MockAutofillManagerDelegate);
+  DISALLOW_COPY_AND_ASSIGN(MockAutofillClient);
 };
 
 class TestAutofillPopupController : public AutofillPopupControllerImpl {
  public:
   explicit TestAutofillPopupController(
       base::WeakPtr<AutofillExternalDelegate> external_delegate,
       const gfx::RectF& element_bounds)
       : AutofillPopupControllerImpl(
             external_delegate, NULL, NULL, element_bounds,
             base::i18n::UNKNOWN_DIRECTION),
@@ skipping 39 matching lines @@
   virtual void ShowView() OVERRIDE {}
 
   TestPopupControllerCommon* test_controller_common_;
 };
 
 }  // namespace
 
 class AutofillPopupControllerUnitTest : public ChromeRenderViewHostTestHarness {
  public:
   AutofillPopupControllerUnitTest()
-      : manager_delegate_(new MockAutofillManagerDelegate()),
+      : autofill_client_(new MockAutofillClient()),
         autofill_popup_controller_(NULL) {}
   virtual ~AutofillPopupControllerUnitTest() {}
 
   virtual void SetUp() OVERRIDE {
     ChromeRenderViewHostTestHarness::SetUp();
 
     ContentAutofillDriver::CreateForWebContentsAndDelegate(
         web_contents(),
-        manager_delegate_.get(),
+        autofill_client_.get(),
         "en-US",
         AutofillManager::ENABLE_AUTOFILL_DOWNLOAD_MANAGER);
     ContentAutofillDriver* driver =
         ContentAutofillDriver::FromWebContents(web_contents());
     external_delegate_.reset(
         new NiceMock<MockAutofillExternalDelegate>(
             driver->autofill_manager(),
             driver));
 
     autofill_popup_controller_ =
@@ skipping 13 matching lines @@
 
   TestAutofillPopupController* popup_controller() {
     return autofill_popup_controller_;
   }
 
   MockAutofillExternalDelegate* delegate() {
     return external_delegate_.get();
   }
 
  protected:
-  scoped_ptr<MockAutofillManagerDelegate> manager_delegate_;
+  scoped_ptr<MockAutofillClient> autofill_client_;
   scoped_ptr<NiceMock<MockAutofillExternalDelegate> > external_delegate_;
   testing::NiceMock<TestAutofillPopupController>* autofill_popup_controller_;
 };
 
 TEST_F(AutofillPopupControllerUnitTest, SetBounds) {
   // Ensure the popup size can be set and causes a redraw.
   gfx::Rect popup_bounds(10, 10, 100, 100);
 
   EXPECT_CALL(*autofill_popup_controller_,
               UpdateBoundsAndRedrawPopup());
@@ skipping 347 matching lines @@
   EXPECT_NE(names[0], autofill_popup_controller_->names()[0]);
   EXPECT_NE(subtexts[0], autofill_popup_controller_->subtexts()[0]);
 
   // The second element was shorter so it should be unchanged.
   EXPECT_EQ(names[1], autofill_popup_controller_->names()[1]);
   EXPECT_EQ(subtexts[1], autofill_popup_controller_->subtexts()[1]);
 }
 #endif
 
 }  // namespace autofill