AutoFill: Aggregate profile data. Remove the AutoFill InfoBar.

chrome/browser/autofill/form_structure_unittest.cc

Index: chrome/browser/autofill/form_structure_unittest.cc
diff --git a/chrome/browser/autofill/form_structure_unittest.cc b/chrome/browser/autofill/form_structure_unittest.cc
index ed90de37ae9e681e35c128d8fbfdd2ca297aa097..7b8848f4c703ac1fdc2d947277f9d22e2759cb71 100644
--- a/chrome/browser/autofill/form_structure_unittest.cc
+++ b/chrome/browser/autofill/form_structure_unittest.cc
@@ -615,7 +615,7 @@ TEST(FormStructureTest, HeuristicsCreditCardInfo) {
   form_structure.reset(new FormStructure(form));
   EXPECT_TRUE(form_structure->IsAutoFillable());
   ASSERT_EQ(6U, form_structure->field_count());
-  ASSERT_EQ(5U, form_structure->autofill_count());
+  ASSERT_EQ(4U, form_structure->autofill_count());
 
   // Credit card name.
   EXPECT_EQ(CREDIT_CARD_NAME, form_structure->field(0)->heuristic_type());
@@ -626,9 +626,8 @@ TEST(FormStructureTest, HeuristicsCreditCardInfo) {
   // Credit card expiration year.
   EXPECT_EQ(CREDIT_CARD_EXP_4_DIGIT_YEAR,
             form_structure->field(3)->heuristic_type());
-  // Credit card cvc.
-  EXPECT_EQ(CREDIT_CARD_VERIFICATION_CODE,
-            form_structure->field(4)->heuristic_type());
+  // We don't determine CVV.
+  EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(4)->heuristic_type());
   // Submit.
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(5)->heuristic_type());
 }
@@ -678,7 +677,7 @@ TEST(FormStructureTest, HeuristicsCreditCardInfoWithUnknownCardField) {
   form_structure.reset(new FormStructure(form));
   EXPECT_TRUE(form_structure->IsAutoFillable());
   ASSERT_EQ(7U, form_structure->field_count());
-  ASSERT_EQ(5U, form_structure->autofill_count());
+  ASSERT_EQ(4U, form_structure->autofill_count());
 
   // Credit card name.
   EXPECT_EQ(CREDIT_CARD_NAME, form_structure->field(0)->heuristic_type());
@@ -691,9 +690,8 @@ TEST(FormStructureTest, HeuristicsCreditCardInfoWithUnknownCardField) {
   // Credit card expiration year.
   EXPECT_EQ(CREDIT_CARD_EXP_4_DIGIT_YEAR,
             form_structure->field(4)->heuristic_type());
-  // Credit card cvc.
-  EXPECT_EQ(CREDIT_CARD_VERIFICATION_CODE,
-            form_structure->field(5)->heuristic_type());
+  // We don't determine CVV.
+  EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(5)->heuristic_type());
   // Submit.
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(6)->heuristic_type());
 }