Make autofill stop depending on InfoBarService

chrome/browser/autofill/autofill_metrics_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 <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
@@ skipping 252 matching lines @@
 class AutofillMetricsTest : public ChromeRenderViewHostTestHarness {
  public:
   AutofillMetricsTest();
   virtual ~AutofillMetricsTest();
 
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
  protected:
   scoped_ptr<ConfirmInfoBarDelegate> CreateDelegate(
-      MockAutofillMetrics* metric_logger,
-      CreditCard** created_card);
+      MockAutofillMetrics* metric_logger);
 
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
   content::TestBrowserThread io_thread_;
 
   scoped_ptr<TestAutofillManager> autofill_manager_;
   TestPersonalDataManager personal_data_;
 
  private:
   std::string default_gmock_verbosity_level_;
@@ skipping 50 matching lines @@
   // AutofillManager is tied to the lifetime of the WebContents, so it must
   // be destroyed at the destruction of the WebContents.
   autofill_manager_.reset();
   profile()->ResetRequestContext();
   file_thread_.Stop();
   ChromeRenderViewHostTestHarness::TearDown();
   io_thread_.Stop();
 }
 
 scoped_ptr<ConfirmInfoBarDelegate> AutofillMetricsTest::CreateDelegate(
-    MockAutofillMetrics* metric_logger,
-    CreditCard** created_card) {
+    MockAutofillMetrics* metric_logger) {
   EXPECT_CALL(*metric_logger,
               LogCreditCardInfoBarMetric(AutofillMetrics::INFOBAR_SHOWN));
-  // The delegate created below will take ownership of this object.
-  CreditCard* credit_card = new CreditCard();
-  if (created_card)
-    *created_card = credit_card;
-  return AutofillCCInfoBarDelegate::Create(credit_card, &personal_data_,
-                                           metric_logger);
+
+  CreditCard credit_card;
+  return AutofillCCInfoBarDelegate::CreateForTesting(
+      metric_logger,
+      base::Bind(&TestPersonalDataManager::SaveImportedCreditCard,
+                 base::Unretained(&personal_data_), credit_card));
 }
 
 // Test that we log quality metrics appropriately.
 TEST_F(AutofillMetricsTest, QualityMetrics) {
   // Set up our form data.
   FormData form;
   form.name = ASCIIToUTF16("TestForm");
   form.method = ASCIIToUTF16("POST");
   form.origin = GURL("http://example.com/form.html");
   form.action = GURL("http://example.com/submit.html");
@@ skipping 777 matching lines @@
   autofill_manager_->OnFormsSeen(std::vector<FormData>(), TimeTicks());
 }
 
 // Test that credit card infobar metrics are logged correctly.
 TEST_F(AutofillMetricsTest, CreditCardInfoBar) {
   MockAutofillMetrics metric_logger;
   ::testing::InSequence dummy;
 
   // Accept the infobar.
   {
-    CreditCard* credit_card;
-    scoped_ptr<ConfirmInfoBarDelegate> infobar(CreateDelegate(&metric_logger,
-                                                              &credit_card));
+    scoped_ptr<ConfirmInfoBarDelegate> infobar(CreateDelegate(&metric_logger));
     ASSERT_TRUE(infobar);
-    EXPECT_CALL(personal_data_, SaveImportedCreditCard(*credit_card));
+    EXPECT_CALL(personal_data_, SaveImportedCreditCard(_));
     EXPECT_CALL(metric_logger,
         LogCreditCardInfoBarMetric(AutofillMetrics::INFOBAR_ACCEPTED)).Times(1);
     EXPECT_CALL(metric_logger,
         LogCreditCardInfoBarMetric(AutofillMetrics::INFOBAR_IGNORED)).Times(0);
     EXPECT_TRUE(infobar->Accept());
   }
 
   // Cancel the infobar.
   {
-    scoped_ptr<ConfirmInfoBarDelegate> infobar(CreateDelegate(&metric_logger,
-                                                              NULL));
+    scoped_ptr<ConfirmInfoBarDelegate> infobar(CreateDelegate(&metric_logger));
     ASSERT_TRUE(infobar);
     EXPECT_CALL(metric_logger,
         LogCreditCardInfoBarMetric(AutofillMetrics::INFOBAR_DENIED)).Times(1);
     EXPECT_CALL(metric_logger,
         LogCreditCardInfoBarMetric(AutofillMetrics::INFOBAR_IGNORED)).Times(0);
     EXPECT_TRUE(infobar->Cancel());
   }
 
   // Dismiss the infobar.
   {
-    scoped_ptr<ConfirmInfoBarDelegate> infobar(CreateDelegate(&metric_logger,
-                                                              NULL));
+    scoped_ptr<ConfirmInfoBarDelegate> infobar(CreateDelegate(&metric_logger));
     ASSERT_TRUE(infobar);
     EXPECT_CALL(metric_logger,
         LogCreditCardInfoBarMetric(AutofillMetrics::INFOBAR_DENIED)).Times(1);
     EXPECT_CALL(metric_logger,
         LogCreditCardInfoBarMetric(AutofillMetrics::INFOBAR_IGNORED)).Times(0);
     infobar->InfoBarDismissed();
   }
 
   // Ignore the infobar.
   {
-    scoped_ptr<ConfirmInfoBarDelegate> infobar(CreateDelegate(&metric_logger,
-                                                              NULL));
+    scoped_ptr<ConfirmInfoBarDelegate> infobar(CreateDelegate(&metric_logger));
     ASSERT_TRUE(infobar);
     EXPECT_CALL(metric_logger,
         LogCreditCardInfoBarMetric(AutofillMetrics::INFOBAR_IGNORED)).Times(1);
   }
 }
 
 // Test that server query response experiment id metrics are logged correctly.
 TEST_F(AutofillMetricsTest, ServerQueryExperimentIdForQuery) {
   MockAutofillMetrics metric_logger;
   ::testing::InSequence dummy;
@@ skipping 374 matching lines @@
     autofill_manager_->OnFormsSeen(forms, TimeTicks::FromInternalValue(1));
     autofill_manager_->OnDidFillAutofillFormData(
         TimeTicks::FromInternalValue(5));
     autofill_manager_->OnTextFieldDidChange(form, form.fields.front(),
                                             TimeTicks::FromInternalValue(3));
     autofill_manager_->FormSubmitted(form, TimeTicks::FromInternalValue(17));
     autofill_manager_->Reset();
     Mock::VerifyAndClearExpectations(autofill_manager_->metric_logger());
   }
 }