[Autofill] Add credit card first and last name heuristics predictions.

chrome/browser/ui/autofill/autofill_dialog_controller_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 <stddef.h>
 
 #include <map>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 465 matching lines @@
               form_structure()->field(18)->Type().GetStorableType());
     EXPECT_EQ(ADDRESS_HOME, form_structure()->field(18)->Type().group());
     base::string16 billing_country = form_structure()->field(11)->value;
     EXPECT_EQ(2U, billing_country.size());
     base::string16 shipping_country = form_structure()->field(18)->value;
     EXPECT_EQ(2U, shipping_country.size());
     EXPECT_FALSE(billing_country.empty());
     EXPECT_FALSE(shipping_country.empty());
     EXPECT_EQ(billing_country, shipping_country);
 
-    EXPECT_EQ(CREDIT_CARD_NAME,
+    EXPECT_EQ(CREDIT_CARD_NAME_FULL,
               form_structure()->field(1)->Type().GetStorableType());
     base::string16 cc_name = form_structure()->field(1)->value;
     EXPECT_EQ(NAME_FULL, form_structure()->field(6)->Type().GetStorableType());
     EXPECT_EQ(NAME_BILLING, form_structure()->field(6)->Type().group());
     base::string16 billing_name = form_structure()->field(6)->value;
     EXPECT_EQ(NAME_FULL, form_structure()->field(13)->Type().GetStorableType());
     EXPECT_EQ(NAME, form_structure()->field(13)->Type().group());
     base::string16 shipping_name = form_structure()->field(13)->value;
 
     EXPECT_FALSE(cc_name.empty());
@@ skipping 480 matching lines @@
 
 TEST_F(AutofillDialogControllerTest, AutofillCreditCards) {
   // Since the PersonalDataManager is empty, this should only have the
   // default menu items.
   EXPECT_FALSE(controller()->MenuModelForSection(SECTION_CC));
 
   EXPECT_CALL(*controller()->GetView(), ModelChanged()).Times(3);
 
   // Empty cards are ignored.
   CreditCard empty_card(base::GenerateGUID(), kSettingsOrigin);
-  empty_card.SetRawInfo(CREDIT_CARD_NAME, ASCIIToUTF16("John Doe"));
+  empty_card.SetRawInfo(CREDIT_CARD_NAME_FULL, ASCIIToUTF16("John Doe"));
   controller()->GetTestingManager()->AddTestingCreditCard(&empty_card);
   EXPECT_FALSE(controller()->MenuModelForSection(SECTION_CC));
 
   // An otherwise full but unverified card should be ignored.
   CreditCard full_card(test::GetCreditCard());
   full_card.set_origin("https://www.example.com");
   controller()->GetTestingManager()->AddTestingCreditCard(&full_card);
   EXPECT_FALSE(controller()->MenuModelForSection(SECTION_CC));
 
   // A full, verified card should be picked up.
@@ skipping 25 matching lines @@
   EXPECT_EQ(ADDRESS_BILLING, form_structure()->field(9)->Type().group());
   EXPECT_EQ(ADDRESS_HOME_STATE,
             form_structure()->field(16)->Type().GetStorableType());
   EXPECT_EQ(ADDRESS_HOME, form_structure()->field(16)->Type().group());
   base::string16 billing_state = form_structure()->field(9)->value;
   base::string16 shipping_state = form_structure()->field(16)->value;
   EXPECT_FALSE(billing_state.empty());
   EXPECT_FALSE(shipping_state.empty());
   EXPECT_NE(billing_state, shipping_state);
 
-  EXPECT_EQ(CREDIT_CARD_NAME,
+  EXPECT_EQ(CREDIT_CARD_NAME_FULL,
             form_structure()->field(1)->Type().GetStorableType());
   base::string16 cc_name = form_structure()->field(1)->value;
   EXPECT_EQ(NAME_FULL, form_structure()->field(6)->Type().GetStorableType());
   EXPECT_EQ(NAME_BILLING, form_structure()->field(6)->Type().group());
   base::string16 billing_name = form_structure()->field(6)->value;
   EXPECT_EQ(NAME_FULL, form_structure()->field(13)->Type().GetStorableType());
   EXPECT_EQ(NAME, form_structure()->field(13)->Type().group());
   base::string16 shipping_name = form_structure()->field(13)->value;
 
   EXPECT_FALSE(cc_name.empty());
@@ skipping 429 matching lines @@
   FillInputs(SECTION_BILLING, test_profile);
 
   UseBillingForShipping();
 
   controller()->GetView()->CheckSaveDetailsLocallyCheckbox(true);
   controller()->OnAccept();
 
   TestPersonalDataManager* test_pdm = controller()->GetTestingManager();
   const CreditCard& imported_card = test_pdm->imported_credit_card();
   EXPECT_EQ(test_profile.GetInfo(AutofillType(NAME_FULL), "en-US"),
-            imported_card.GetRawInfo(CREDIT_CARD_NAME));
+            imported_card.GetRawInfo(CREDIT_CARD_NAME_FULL));
 }
 
 TEST_F(AutofillDialogControllerTest, SaveCreditCardIncludesName_WithBilling) {
   TestPersonalDataManager* test_pdm = controller()->GetTestingManager();
   AutofillProfile test_profile(test::GetVerifiedProfile());
 
   EXPECT_CALL(*controller()->GetView(), ModelChanged());
   test_pdm->AddTestingProfile(&test_profile);
   ASSERT_TRUE(controller()->MenuModelForSection(SECTION_BILLING));
 
   CreditCard test_credit_card(test::GetVerifiedCreditCard());
   FillInputs(SECTION_CC, test_credit_card);
 
   controller()->GetView()->CheckSaveDetailsLocallyCheckbox(true);
   controller()->OnAccept();
 
   const CreditCard& imported_card = test_pdm->imported_credit_card();
   EXPECT_EQ(test_profile.GetInfo(AutofillType(NAME_FULL), "en-US"),
-            imported_card.GetRawInfo(CREDIT_CARD_NAME));
+            imported_card.GetRawInfo(CREDIT_CARD_NAME_FULL));
 
   controller()->ViewClosed();
 }
 
 // Verifies that a call to the IconsForFields() method before the card type is
 // known returns a placeholder image that is at least as large as the icons for
 // all of the supported major credit card issuers.
 TEST_F(AutofillDialogControllerTest, IconReservedForCreditCardField) {
   FieldValueMap inputs;
   inputs[CREDIT_CARD_NUMBER] = base::string16();
@@ skipping 321 matching lines @@
       SECTION_SHIPPING,
       NAME_FULL,
       gfx::NativeView(),
       gfx::Rect(),
       profile.GetRawInfo(NAME_FULL).substr(0, 1),
       true);
   EXPECT_EQ(NAME_FULL, controller()->popup_input_type());
 }
 
 }  // namespace autofill