[Autofill] Componentize AutofillCCInfoBarDelegate.

chrome/browser/autofill/autofill_cc_infobar_delegate_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 "chrome/browser/autofill/autofill_cc_infobar_delegate.h"
+#include "components/autofill/core/browser/autofill_cc_infobar_delegate.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/test/histogram_tester.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/ui/autofill/chrome_autofill_client.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/content/browser/content_autofill_driver_factory.h"
+#include "components/autofill/core/browser/autofill_manager.h"
 #include "components/autofill/core/browser/autofill_test_utils.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;
 
 namespace autofill {
 
 namespace {
@@ skipping 20 matching lines @@
 
 class AutofillCCInfobarDelegateTest : public ChromeRenderViewHostTestHarness {
  public:
   ~AutofillCCInfobarDelegateTest() override;
 
   void SetUp() override;
   void TearDown() override;
 
  protected:
   scoped_ptr<ConfirmInfoBarDelegate> CreateDelegate();
+  ContentAutofillDriver* GetAutofillDriverForMainFrame();
 
   scoped_ptr<TestPersonalDataManager> personal_data_;
 };

[Peter Kasting, 2014/12/23 21:20:34]

Nit: While here: DISALLOW_COPY_AND_ASSIGN()

[Pritam Nikam, 2014/12/24 11:16:57]

Done.

 
 AutofillCCInfobarDelegateTest::~AutofillCCInfobarDelegateTest() {}
 
 void AutofillCCInfobarDelegateTest::SetUp() {
   ChromeRenderViewHostTestHarness::SetUp();
 
   // Ensure Mac OS X does not pop up a modal dialog for the Address Book.
   test::DisableSystemServices(profile()->GetPrefs());
 
   PersonalDataManagerFactory::GetInstance()->SetTestingFactory(profile(), NULL);
 
   ChromeAutofillClient::CreateForWebContents(web_contents());
   ChromeAutofillClient* autofill_client =
       ChromeAutofillClient::FromWebContents(web_contents());
 
+  // Associate the |ContentAutofillDriverFactory| to the |WebContents|.

[Peter Kasting, 2014/12/23 21:20:34]

Nit: Only use ||s for variable names, not type names.

I'm not sure this comment adds much to the code anyway.  I might just leave it
out.

[Pritam Nikam, 2014/12/24 11:16:57]

Done.

+  ContentAutofillDriverFactory::CreateForWebContentsAndDelegate(
+      web_contents(), autofill_client, "en-US",
+      AutofillManager::DISABLE_AUTOFILL_DOWNLOAD_MANAGER);
+
   personal_data_.reset(new TestPersonalDataManager());
   personal_data_->set_database(autofill_client->GetDatabase());
   personal_data_->SetPrefService(profile()->GetPrefs());
 }
 
 void AutofillCCInfobarDelegateTest::TearDown() {
   personal_data_.reset();
   ChromeRenderViewHostTestHarness::TearDown();
 }
 
+ContentAutofillDriver*
+AutofillCCInfobarDelegateTest::GetAutofillDriverForMainFrame() {
+  ContentAutofillDriverFactory* autofill_driver_factory =
+      ContentAutofillDriverFactory::FromWebContents(web_contents());
+

[Peter Kasting, 2014/12/23 21:20:34]

Nit: Blank here is unnecessary

[Pritam Nikam, 2014/12/24 11:16:57]

Done.

+  return autofill_driver_factory->DriverForFrame(
+      web_contents()->GetMainFrame());
+}
+
 scoped_ptr<ConfirmInfoBarDelegate>
 AutofillCCInfobarDelegateTest::CreateDelegate() {
   base::HistogramTester histogram_tester;
   CreditCard credit_card;
-  scoped_ptr<ConfirmInfoBarDelegate> delegate(
-      AutofillCCInfoBarDelegate::Create(base::Bind(
+  scoped_ptr<ConfirmInfoBarDelegate> delegate(AutofillCCInfoBarDelegate::Create(
+      GetAutofillDriverForMainFrame(),
+      base::Bind(
           base::IgnoreResult(&TestPersonalDataManager::SaveImportedCreditCard),
           base::Unretained(personal_data_.get()), credit_card)));
   histogram_tester.ExpectUniqueSample("Autofill.CreditCardInfoBar",
                                       AutofillMetrics::INFOBAR_SHOWN, 1);
   return delegate.Pass();
 }
 
 // Test that credit card infobar metrics are logged correctly.
 TEST_F(AutofillCCInfobarDelegateTest, Metrics) {
   ::testing::InSequence dummy;
@@ skipping 34 matching lines @@
     scoped_ptr<ConfirmInfoBarDelegate> infobar(CreateDelegate());
 
     base::HistogramTester histogram_tester;
     infobar.reset();
     histogram_tester.ExpectUniqueSample("Autofill.CreditCardInfoBar",
                                         AutofillMetrics::INFOBAR_IGNORED, 1);
   }
 }
 
 }  // namespace autofill