Make PersonalDataManager use GetCreditCards() (rather than using credit_cards_ directly) so Autofill

chrome/browser/autofill/autofill_browsertest.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 <string>
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 1118 matching lines @@
                                L"\u03cd\u03c3\u03b5\u03b9\u03c2 "
                                L"\u03ba\u03b1\u03b9 "
                                L"\u03ba\u03b1\u03c4\u03b1\u03c1\u03b3\u03ae"
                                L"\u03c3\u03b5\u03b9\u03c2"));
   card4.SetRawInfo(CREDIT_CARD_NUMBER, WideToUTF16(L"00000000000000000000000"));
   card4.SetRawInfo(CREDIT_CARD_EXP_MONTH, WideToUTF16(L"01"));
   card4.SetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR, WideToUTF16(L"2016"));
   cards.push_back(card4);
 
   SetCards(&cards);
-  ASSERT_EQ(cards.size(), personal_data_manager()->credit_cards().size());
+  ASSERT_EQ(cards.size(), personal_data_manager()->GetCreditCards().size());
   for (size_t i = 0; i < cards.size(); ++i)
-    ASSERT_EQ(cards[i], *personal_data_manager()->credit_cards()[i]);
+    ASSERT_EQ(cards[i], *personal_data_manager()->GetCreditCards()[i]);

[Lei Zhang, 2013/05/01 04:08:52]

nits you may want to fix later - maybe just call GetCreditCard() once rather
than over and over again in the loop?

[Lei Zhang, 2013/05/01 04:08:52]

you may also want to just EXPECT_EQ here. Ditto with some of the tests below
once you know you are not going to go out of bounds.

[Dan Beam, 2013/05/01 04:19:36]

while I agree it should be EXPECT_EQ() here I really don't want to change this
in this CL

[Dan Beam, 2013/05/01 04:19:36]

yeah, I'm not sure of the point of that... though it's probably quite cheap.  I
think just the name being GetCreditCards() makes it scarier than credit_cards()
because of chrome's dumb_accessor() vs MayDoALot() naming...

 }
 
 // Test filling in invalid values for profiles are saved as-is. Phone
 // information entered into the prefs UI is not validated or rejected except for
 // duplicates.
 // TODO(isherman): rewrite as WebUI test?
 IN_PROC_BROWSER_TEST_F(AutofillTest, Invalid) {
   // First try profiles with invalid ZIP input.
   AutofillProfile without_invalid;
   without_invalid.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Will"));
@@ skipping 14 matching lines @@
             profile.GetRawInfo(PHONE_HOME_WHOLE_NUMBER));
 }
 
 // Test invalid credit card numbers typed in prefs should be saved as-is.
 // TODO(isherman): rewrite as WebUI test?
 IN_PROC_BROWSER_TEST_F(AutofillTest, PrefsStringSavedAsIs) {
   CreditCard card;
   card.SetRawInfo(CREDIT_CARD_NUMBER, ASCIIToUTF16("Not_0123-5Checked"));
   SetCard(card);
 
-  ASSERT_EQ(1u, personal_data_manager()->credit_cards().size());
-  ASSERT_EQ(card, *personal_data_manager()->credit_cards()[0]);
+  ASSERT_EQ(1u, personal_data_manager()->GetCreditCards().size());
+  ASSERT_EQ(card, *personal_data_manager()->GetCreditCards()[0]);
 }
 
 // Test credit card info with an invalid number is not aggregated.
 // When filling out a form with an invalid credit card number (one that does not
 // pass the Luhn test) the credit card info should not be saved into Autofill
 // preferences.
 IN_PROC_BROWSER_TEST_F(AutofillTest, InvalidCreditCardNumberIsNotAggregated) {
   ASSERT_TRUE(test_server()->Start());
   std::string card("4408 0412 3456 7890");
   ASSERT_FALSE(autofill::IsValidCreditCardNumber(ASCIIToUTF16(card)));
   SubmitCreditCard("Bob Smith", card.c_str(), "12", "2014");
   ASSERT_EQ(0u,
             InfoBarService::FromWebContents(
                 browser()->tab_strip_model()->GetActiveWebContents())->
                     infobar_count());
 }
 
 // Test whitespaces and separator chars are stripped for valid CC numbers.
 // The credit card numbers used in this test pass the Luhn test. For reference:
 // http://www.merriampark.com/anatomycc.htm
 IN_PROC_BROWSER_TEST_F(AutofillTest,
                        WhitespacesAndSeparatorCharsStrippedForValidCCNums) {
   ASSERT_TRUE(test_server()->Start());
   SubmitCreditCard("Bob Smith", "4408 0412 3456 7893", "12", "2014");
   SubmitCreditCard("Jane Doe", "4417-1234-5678-9113", "10", "2013");
 
-  ASSERT_EQ(2u, personal_data_manager()->credit_cards().size());
-  string16 cc1 = personal_data_manager()->credit_cards()[0]->GetRawInfo(
+  ASSERT_EQ(2u, personal_data_manager()->GetCreditCards().size());
+  string16 cc1 = personal_data_manager()->GetCreditCards()[0]->GetRawInfo(
       CREDIT_CARD_NUMBER);
   ASSERT_TRUE(autofill::IsValidCreditCardNumber(cc1));
-  string16 cc2 = personal_data_manager()->credit_cards()[1]->GetRawInfo(
+  string16 cc2 = personal_data_manager()->GetCreditCards()[1]->GetRawInfo(
       CREDIT_CARD_NUMBER);
   ASSERT_TRUE(autofill::IsValidCreditCardNumber(cc2));
 }
 
 // Test that Autofill aggregates a minimum valid profile.
 // The minimum required address fields must be specified: First Name, Last Name,
 // Address Line 1, City, Zip Code, and State.
 IN_PROC_BROWSER_TEST_F(AutofillTest, AggregatesMinValidProfile) {
   ASSERT_TRUE(test_server()->Start());
   FormMap data;
@@ skipping 491 matching lines @@
 IN_PROC_BROWSER_TEST_F(AutofillTest,
                        DISABLED_MergeAggregatedDuplicatedProfiles) {
   int num_of_profiles =
       AggregateProfilesIntoAutofillPrefs("dataset_no_address.txt");
 
   ASSERT_GT(num_of_profiles,
             static_cast<int>(personal_data_manager()->GetProfiles().size()));
 }
 
 }  // namespace autofill