Rename AutofillManagerDelegate to AutofillClient.

components/autofill/content/browser/content_autofill_driver_unittest.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 <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/content/browser/content_autofill_driver.h"
 #include "components/autofill/content/common/autofill_messages.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/test_autofill_manager_delegate.h"
+#include "components/autofill/core/browser/test_autofill_client.h"
 #include "components/autofill/core/common/autofill_switches.h"
 #include "components/autofill/core/common/form_data_predictions.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/frame_navigate_params.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_renderer_host.h"
 #include "ipc/ipc_test_sink.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace autofill {
 
 namespace {
 
 const std::string kAppLocale = "en-US";
 const AutofillManager::AutofillDownloadManagerState kDownloadState =
     AutofillManager::DISABLE_AUTOFILL_DOWNLOAD_MANAGER;
 
 }  // namespace
 
 class MockAutofillManager : public AutofillManager {
  public:
-  MockAutofillManager(AutofillDriver* driver, AutofillManagerDelegate* delegate)
-      : AutofillManager(driver, delegate, kAppLocale, kDownloadState) {}
+  MockAutofillManager(AutofillDriver* driver, AutofillClient* client)
+      : AutofillManager(driver, client, kAppLocale, kDownloadState) {}
   virtual ~MockAutofillManager() {}
 
   MOCK_METHOD0(Reset, void());
 };
 
 class TestContentAutofillDriver : public ContentAutofillDriver {
  public:
   TestContentAutofillDriver(content::WebContents* contents,
-                            AutofillManagerDelegate* delegate)
-      : ContentAutofillDriver(contents, delegate, kAppLocale, kDownloadState) {
+                            AutofillClient* client)
+      : ContentAutofillDriver(contents, client, kAppLocale, kDownloadState) {
     scoped_ptr<AutofillManager> autofill_manager(
-        new MockAutofillManager(this, delegate));
+        new MockAutofillManager(this, client));
     SetAutofillManager(autofill_manager.Pass());
   }
   virtual ~TestContentAutofillDriver() {}
 
   virtual MockAutofillManager* mock_autofill_manager() {
     return static_cast<MockAutofillManager*>(autofill_manager());
   }
 
   using ContentAutofillDriver::DidNavigateMainFrame;
 };
 
 class ContentAutofillDriverTest : public content::RenderViewHostTestHarness {
  public:
   virtual void SetUp() OVERRIDE {
     content::RenderViewHostTestHarness::SetUp();
 
-    test_manager_delegate_.reset(new TestAutofillManagerDelegate());
+    test_autofill_client_.reset(new TestAutofillClient());
     driver_.reset(new TestContentAutofillDriver(web_contents(),
-                                                test_manager_delegate_.get()));
+                                                test_autofill_client_.get()));
   }
 
   virtual void TearDown() OVERRIDE {
     // Reset the driver now to cause all pref observers to be removed and avoid
     // crashes that otherwise occur in the destructor.
     driver_.reset();
     content::RenderViewHostTestHarness::TearDown();
   }
 
  protected:
@@ skipping 100 matching lines @@
   // of sent messages and returns true.
   bool HasMessageMatchingID(uint32 messageID) {
     const IPC::Message* message =
         process()->sink().GetFirstMessageMatching(messageID);
     if (!message)
       return false;
     process()->sink().ClearMessages();
     return true;
   }
 
-  scoped_ptr<TestAutofillManagerDelegate> test_manager_delegate_;
+  scoped_ptr<TestAutofillClient> test_autofill_client_;
   scoped_ptr<TestContentAutofillDriver> driver_;
 };
 
 TEST_F(ContentAutofillDriverTest, GetURLRequestContext) {
   net::URLRequestContextGetter* request_context =
       driver_->GetURLRequestContext();
   net::URLRequestContextGetter* expected_request_context =
       web_contents()->GetBrowserContext()->GetRequestContext();
   EXPECT_EQ(request_context, expected_request_context);
 }
@@ skipping 109 matching lines @@
   base::string16 input_value(base::ASCIIToUTF16("barqux"));
   base::string16 output_value;
   driver_->RendererShouldPreviewFieldWithValue(input_value);
   EXPECT_TRUE(GetString16FromMessageWithID(
       AutofillMsg_PreviewFieldWithValue::ID,
       &output_value));
   EXPECT_EQ(input_value, output_value);
 }
 
 }  // namespace autofill