AutoFill: Aggregate profile data. Remove the AutoFill InfoBar.

chrome/browser/webdata/web_database_unittest.cc

Index: chrome/browser/webdata/web_database_unittest.cc
diff --git a/chrome/browser/webdata/web_database_unittest.cc b/chrome/browser/webdata/web_database_unittest.cc
index 0b9af58e6ce556abefdbecc586415a1062ca498e..a71e8e42063fa35aae5979a0c46bae6850d9c8fc 100644
--- a/chrome/browser/webdata/web_database_unittest.cc
+++ b/chrome/browser/webdata/web_database_unittest.cc
@@ -1177,10 +1177,7 @@ TEST_F(WebDatabaseTest, CreditCard) {
                           ASCIIToUTF16("04"));
   work_creditcard.SetInfo(AutoFillType(CREDIT_CARD_EXP_4_DIGIT_YEAR),
                           ASCIIToUTF16("2013"));
-  work_creditcard.SetInfo(AutoFillType(CREDIT_CARD_VERIFICATION_CODE),
-                          ASCIIToUTF16("987"));
   work_creditcard.set_billing_address(ASCIIToUTF16("Overlook Hotel"));
-  work_creditcard.set_shipping_address(ASCIIToUTF16("Timberline Lodge"));
 
   EXPECT_TRUE(db.AddCreditCard(work_creditcard));
 
@@ -1202,10 +1199,7 @@ TEST_F(WebDatabaseTest, CreditCard) {
                             ASCIIToUTF16("06"));
   target_creditcard.SetInfo(AutoFillType(CREDIT_CARD_EXP_4_DIGIT_YEAR),
                             ASCIIToUTF16("2012"));
-  target_creditcard.SetInfo(AutoFillType(CREDIT_CARD_VERIFICATION_CODE),
-                            ASCIIToUTF16("123"));
   target_creditcard.set_billing_address(ASCIIToUTF16("Overlook Hotel"));
-  target_creditcard.set_shipping_address(string16());
 
   EXPECT_TRUE(db.AddCreditCard(target_creditcard));
   ASSERT_TRUE(db.GetCreditCardForLabel(ASCIIToUTF16("Target"),