Remove test-only constructor from CreditCard.

chrome/browser/browsing_data/autofill_counter_browsertest.cc

 // Copyright (c) 2015 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 "components/browsing_data/core/counters/autofill_counter.h"
 
 #include "base/guid.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/platform_thread.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/web_data_service_factory.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/autofill_test_utils.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/browsing_data/core/browsing_data_utils.h"
 #include "components/browsing_data/core/pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace {
 
@@ skipping 30 matching lines @@
         base::ASCIIToUTF16(value));
   }
 
   void ClearAutocompleteSuggestions() {
     web_data_service_->RemoveFormElementsAddedBetween(
         base::Time(), base::Time::Max());
   }
 
   // Credit cards --------------------------------------------------------------
 
-  void AddCreditCard(const std::string& card_number,
-                     int exp_month,
-                     int exp_year) {
-    autofill::CreditCard card(
-        base::ASCIIToUTF16(card_number), exp_month, exp_year);
-    std::string id = base::GenerateGUID();
-    credit_card_ids_.push_back(id);
-    card.set_guid(id);
+  void AddCreditCard(const char* card_number,
+                     const char* exp_month,
+                     const char* exp_year) {
+    autofill::CreditCard card;
+    autofill::test::SetCreditCardInfo(&card, nullptr, card_number, exp_month,
+                                      exp_year);
+    credit_card_ids_.push_back(card.guid());
     web_data_service_->AddCreditCard(card);
   }
 
   void RemoveLastCreditCard() {
     web_data_service_->RemoveCreditCard(credit_card_ids_.back());
     credit_card_ids_.pop_back();
   }
 
   // Addresses -----------------------------------------------------------------
 
@@ skipping 168 matching lines @@
 // Tests that we count the correct number of credit cards.
 IN_PROC_BROWSER_TEST_F(AutofillCounterTest, CreditCards) {
   Profile* profile = browser()->profile();
   browsing_data::AutofillCounter counter(GetWebDataService());
   counter.Init(profile->GetPrefs(), base::Bind(&AutofillCounterTest::Callback,
                                                base::Unretained(this)));
   counter.Restart();
   WaitForCounting();
   EXPECT_EQ(0, GetNumCreditCards());
 
-  AddCreditCard("0000-0000-0000-0000", 1, 2015);
+  AddCreditCard("0000-0000-0000-0000", "1", "2015");
   counter.Restart();
   WaitForCounting();
   EXPECT_EQ(1, GetNumCreditCards());
 
-  AddCreditCard("0123-4567-8910-1112", 10, 2015);
+  AddCreditCard("0123-4567-8910-1112", "10", "2015");
   counter.Restart();
   WaitForCounting();
   EXPECT_EQ(2, GetNumCreditCards());
 
-  AddCreditCard("1211-1098-7654-3210", 10, 2030);
+  AddCreditCard("1211-1098-7654-3210", "10", "2030");
   counter.Restart();
   WaitForCounting();
   EXPECT_EQ(3, GetNumCreditCards());
 
   RemoveLastCreditCard();
   counter.Restart();
   WaitForCounting();
   EXPECT_EQ(2, GetNumCreditCards());
 
   ClearCreditCardsAndAddresses();
@@ skipping 40 matching lines @@
 
 // Tests that we return the correct complex result when counting more than
 // one type of items.
 IN_PROC_BROWSER_TEST_F(AutofillCounterTest, ComplexResult) {
   AddAutocompleteSuggestion("email", "example@example.com");
   AddAutocompleteSuggestion("zip", "12345");
   AddAutocompleteSuggestion("tel", "+123456789");
   AddAutocompleteSuggestion("tel", "+987654321");
   AddAutocompleteSuggestion("city", "Munich");
 
-  AddCreditCard("0000-0000-0000-0000", 1, 2015);
-  AddCreditCard("1211-1098-7654-3210", 10, 2030);
+  AddCreditCard("0000-0000-0000-0000", "1", "2015");
+  AddCreditCard("1211-1098-7654-3210", "10", "2030");
 
   AddAddress("John", "Doe", "Main Street 12345");
   AddAddress("Jane", "Smith", "Main Street 12346");
   AddAddress("John", "Smith", "Side Street 47");
 
   Profile* profile = browser()->profile();
   browsing_data::AutofillCounter counter(GetWebDataService());
   counter.Init(profile->GetPrefs(), base::Bind(&AutofillCounterTest::Callback,
                                                base::Unretained(this)));
   counter.Restart();
   WaitForCounting();
   EXPECT_EQ(5, GetNumSuggestions());
   EXPECT_EQ(2, GetNumCreditCards());
   EXPECT_EQ(3, GetNumAddresses());
 }
 
 // Tests that the counting respects time ranges.
 IN_PROC_BROWSER_TEST_F(AutofillCounterTest, TimeRanges) {
   // This test makes time comparisons that are precise to a microsecond, but the
   // database uses the time_t format which is only precise to a second.
   // Make sure we use timestamps rounded to a second.
   base::Time time1 = base::Time::FromTimeT(base::Time::Now().ToTimeT());
 
   AddAutocompleteSuggestion("email", "example@example.com");
-  AddCreditCard("0000-0000-0000-0000", 1, 2015);
+  AddCreditCard("0000-0000-0000-0000", "1", "2015");
   AddAddress("John", "Doe", "Main Street 12345");
   WaitForDBThread();
 
   // Skip at least a second has passed and add another batch.
   base::PlatformThread::Sleep(base::TimeDelta::FromSeconds(1));
   base::Time time2 = base::Time::FromTimeT(base::Time::Now().ToTimeT());
 
-  AddCreditCard("0123-4567-8910-1112", 10, 2015);
+  AddCreditCard("0123-4567-8910-1112", "10", "2015");
   AddAddress("Jane", "Smith", "Main Street 12346");
   AddAddress("John", "Smith", "Side Street 47");
   WaitForDBThread();
 
   // Skip at least a second has passed and add another batch.
   base::PlatformThread::Sleep(base::TimeDelta::FromSeconds(1));
   base::Time time3 = base::Time::FromTimeT(base::Time::Now().ToTimeT());
 
   AddAutocompleteSuggestion("tel", "+987654321");
-  AddCreditCard("1211-1098-7654-3210", 10, 2030);
+  AddCreditCard("1211-1098-7654-3210", "10", "2030");
   WaitForDBThread();
 
   // Test the results for different starting points.
   struct TestCase {
     const base::Time period_start;
     const browsing_data::BrowsingDataCounter::ResultInt
         expected_num_suggestions;
     const browsing_data::BrowsingDataCounter::ResultInt
         expected_num_credit_cards;
     const browsing_data::BrowsingDataCounter::ResultInt expected_num_addresses;
@@ skipping 13 matching lines @@
     counter.SetPeriodStartForTesting(test_case.period_start);
     counter.Restart();
     WaitForCounting();
     EXPECT_EQ(test_case.expected_num_suggestions, GetNumSuggestions());
     EXPECT_EQ(test_case.expected_num_credit_cards, GetNumCreditCards());
     EXPECT_EQ(test_case.expected_num_addresses, GetNumAddresses());
   }
 }
 
 }  // namespace