summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/autofill/android/personal_data_manager_android.cc10
-rw-r--r--chrome/browser/autofill/autofill_browsertest.cc8
-rw-r--r--chrome/browser/extensions/api/autofill_private/autofill_private_api.cc5
-rw-r--r--chrome/browser/extensions/api/autofill_private/autofill_util.cc2
-rw-r--r--chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc2
-rw-r--r--chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc5
-rw-r--r--chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc2
-rw-r--r--chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc10
-rw-r--r--chrome/browser/ui/autofill/data_model_wrapper.cc2
-rw-r--r--chrome/browser/ui/webui/options/autofill_options_handler.cc5
10 files changed, 25 insertions, 26 deletions
diff --git a/chrome/browser/autofill/android/personal_data_manager_android.cc b/chrome/browser/autofill/android/personal_data_manager_android.cc
index 86f424d..e185c30 100644
--- a/chrome/browser/autofill/android/personal_data_manager_android.cc
+++ b/chrome/browser/autofill/android/personal_data_manager_android.cc
@@ -131,13 +131,15 @@ ScopedJavaLocalRef<jobject> CreateJavaCreditCardFromNative(
ConvertUTF8ToJavaString(env, card.origin()).obj(),
card.record_type() == CreditCard::LOCAL_CARD,
card.record_type() == CreditCard::FULL_SERVER_CARD,
- ConvertUTF16ToJavaString(env, card.GetRawInfo(CREDIT_CARD_NAME)).obj(),
+ ConvertUTF16ToJavaString(env, card.GetRawInfo(CREDIT_CARD_NAME_FULL))
+ .obj(),
ConvertUTF16ToJavaString(env, card.GetRawInfo(CREDIT_CARD_NUMBER)).obj(),
ConvertUTF16ToJavaString(env, card.TypeAndLastFourDigits()).obj(),
ConvertUTF16ToJavaString(env, card.GetRawInfo(CREDIT_CARD_EXP_MONTH))
.obj(),
- ConvertUTF16ToJavaString(
- env, card.GetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR)).obj());
+ ConvertUTF16ToJavaString(env,
+ card.GetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR))
+ .obj());
}
void PopulateNativeCreditCardFromJava(
@@ -147,7 +149,7 @@ void PopulateNativeCreditCardFromJava(
card->set_origin(
ConvertJavaStringToUTF8(Java_CreditCard_getOrigin(env, jcard)));
card->SetRawInfo(
- CREDIT_CARD_NAME,
+ CREDIT_CARD_NAME_FULL,
ConvertJavaStringToUTF16(Java_CreditCard_getName(env, jcard)));
card->SetRawInfo(
CREDIT_CARD_NUMBER,
diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc
index 2e0c077..526b72c 100644
--- a/chrome/browser/autofill/autofill_browsertest.cc
+++ b/chrome/browser/autofill/autofill_browsertest.cc
@@ -364,7 +364,7 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, FillProfileCrazyCharacters) {
std::vector<CreditCard> cards;
CreditCard card1;
- card1.SetRawInfo(CREDIT_CARD_NAME,
+ card1.SetRawInfo(CREDIT_CARD_NAME_FULL,
WideToUTF16(L"\u751f\u6d3b\u5f88\u6709\u89c4\u5f8b "
L"\u4ee5\u73a9\u4e3a\u4e3b"));
card1.SetRawInfo(CREDIT_CARD_NUMBER, WideToUTF16(L"6011111111111117"));
@@ -373,14 +373,14 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, FillProfileCrazyCharacters) {
cards.push_back(card1);
CreditCard card2;
- card2.SetRawInfo(CREDIT_CARD_NAME, WideToUTF16(L"John Williams"));
+ card2.SetRawInfo(CREDIT_CARD_NAME_FULL, WideToUTF16(L"John Williams"));
card2.SetRawInfo(CREDIT_CARD_NUMBER, WideToUTF16(L"WokoAwesome12345"));
card2.SetRawInfo(CREDIT_CARD_EXP_MONTH, WideToUTF16(L"10"));
card2.SetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR, WideToUTF16(L"2015"));
cards.push_back(card2);
CreditCard card3;
- card3.SetRawInfo(CREDIT_CARD_NAME,
+ card3.SetRawInfo(CREDIT_CARD_NAME_FULL,
WideToUTF16(L"\u0623\u062d\u0645\u062f\u064a "
L"\u0646\u062c\u0627\u062f "
L"\u0644\u0645\u062d\u0627\u0648\u0644\u0647 "
@@ -396,7 +396,7 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, FillProfileCrazyCharacters) {
cards.push_back(card3);
CreditCard card4;
- card4.SetRawInfo(CREDIT_CARD_NAME,
+ card4.SetRawInfo(CREDIT_CARD_NAME_FULL,
WideToUTF16(L"\u039d\u03ad\u03b5\u03c2 "
L"\u03c3\u03c5\u03b3\u03c7\u03c9\u03bd\u03b5"
L"\u03cd\u03c3\u03b5\u03b9\u03c2 "
diff --git a/chrome/browser/extensions/api/autofill_private/autofill_private_api.cc b/chrome/browser/extensions/api/autofill_private/autofill_private_api.cc
index 3bb54eb..10ace1a 100644
--- a/chrome/browser/extensions/api/autofill_private/autofill_private_api.cc
+++ b/chrome/browser/extensions/api/autofill_private/autofill_private_api.cc
@@ -326,9 +326,8 @@ ExtensionFunction::ResponseAction AutofillPrivateSaveCreditCardFunction::Run() {
autofill::CreditCard credit_card(guid, kSettingsOrigin);
if (card->name) {
- credit_card.SetRawInfo(
- autofill::CREDIT_CARD_NAME,
- base::UTF8ToUTF16(*card->name));
+ credit_card.SetRawInfo(autofill::CREDIT_CARD_NAME_FULL,
+ base::UTF8ToUTF16(*card->name));
}
if (card->card_number) {
diff --git a/chrome/browser/extensions/api/autofill_private/autofill_util.cc b/chrome/browser/extensions/api/autofill_private/autofill_util.cc
index e4ebbf5..04d5eb1 100644
--- a/chrome/browser/extensions/api/autofill_private/autofill_util.cc
+++ b/chrome/browser/extensions/api/autofill_private/autofill_util.cc
@@ -119,7 +119,7 @@ scoped_ptr<autofill_private::CreditCardEntry> CreditCardToCreditCardEntry(
// Add all credit card fields to the entry.
card->guid.reset(new std::string(credit_card.guid()));
card->name.reset(new std::string(base::UTF16ToUTF8(
- credit_card.GetRawInfo(autofill::CREDIT_CARD_NAME))));
+ credit_card.GetRawInfo(autofill::CREDIT_CARD_NAME_FULL))));
card->card_number.reset(new std::string(base::UTF16ToUTF8(
credit_card.GetRawInfo(autofill::CREDIT_CARD_NUMBER))));
card->expiration_month.reset(new std::string(base::UTF16ToUTF8(
diff --git a/chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc b/chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc
index 98836ee..d2ad62fd 100644
--- a/chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc
@@ -222,7 +222,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientWalletSyncTest, Download) {
ASSERT_EQ(kDefaultCardExpMonth, card->expiration_month());
ASSERT_EQ(kDefaultCardExpYear, card->expiration_year());
ASSERT_EQ(base::UTF8ToUTF16(kDefaultCardName),
- card->GetRawInfo(autofill::ServerFieldType::CREDIT_CARD_NAME));
+ card->GetRawInfo(autofill::ServerFieldType::CREDIT_CARD_NAME_FULL));
}
// Wallet data should get cleared from the database when sync is disabled.
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
index 6d1f30d..6cc9689 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
@@ -899,9 +899,8 @@ IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest,
ASSERT_TRUE(controller);
const CreditCard& credit_card = test::GetVerifiedCreditCard();
- ASSERT_TRUE(
- credit_card.GetRawInfo(CREDIT_CARD_NAME).find(ASCIIToUTF16("zebra")) ==
- base::string16::npos);
+ ASSERT_TRUE(credit_card.GetRawInfo(CREDIT_CARD_NAME_FULL)
+ .find(ASCIIToUTF16("zebra")) == base::string16::npos);
AddCreditcardToProfile(controller->profile(), credit_card);
AddAutofillProfileToProfile(controller->profile(),
test::GetVerifiedProfile());
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
index ccfe477..5937dc3 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
@@ -1685,7 +1685,7 @@ void AutofillDialogControllerImpl::FillOutputForSectionWithComparator(
FillFormGroupFromOutputs(output, &card);
// The card holder name comes from the billing address section.
- card.SetRawInfo(CREDIT_CARD_NAME,
+ card.SetRawInfo(CREDIT_CARD_NAME_FULL,
GetValueFromSection(SECTION_BILLING, NAME_BILLING_FULL));
if (ShouldSaveDetailsLocally()) {
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
index d10b628..ecee41e 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
@@ -483,7 +483,7 @@ class AutofillDialogControllerTest : public ChromeRenderViewHostTestHarness {
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());
@@ -984,7 +984,7 @@ TEST_F(AutofillDialogControllerTest, AutofillCreditCards) {
// 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));
@@ -1030,7 +1030,7 @@ TEST_F(AutofillDialogControllerTest, DontUseBillingAsShipping) {
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());
@@ -1480,7 +1480,7 @@ TEST_F(AutofillDialogControllerTest, SaveCreditCardIncludesName_NoBilling) {
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) {
@@ -1499,7 +1499,7 @@ TEST_F(AutofillDialogControllerTest, SaveCreditCardIncludesName_WithBilling) {
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();
}
diff --git a/chrome/browser/ui/autofill/data_model_wrapper.cc b/chrome/browser/ui/autofill/data_model_wrapper.cc
index 6a71ee3..b00e5da 100644
--- a/chrome/browser/ui/autofill/data_model_wrapper.cc
+++ b/chrome/browser/ui/autofill/data_model_wrapper.cc
@@ -110,7 +110,7 @@ base::string16 AutofillProfileWrapper::GetInfo(const AutofillType& type) const {
// but the AutofillProfile class doesn't know how to fill credit card
// fields. So, request for the corresponding profile type instead.
AutofillType effective_type = type;
- if (type.GetStorableType() == CREDIT_CARD_NAME)
+ if (type.GetStorableType() == CREDIT_CARD_NAME_FULL)
effective_type = AutofillType(NAME_BILLING_FULL);
const std::string& app_locale = g_browser_process->GetApplicationLocale();
diff --git a/chrome/browser/ui/webui/options/autofill_options_handler.cc b/chrome/browser/ui/webui/options/autofill_options_handler.cc
index 388ad27..df458ba 100644
--- a/chrome/browser/ui/webui/options/autofill_options_handler.cc
+++ b/chrome/browser/ui/webui/options/autofill_options_handler.cc
@@ -453,8 +453,7 @@ void AutofillOptionsHandler::LoadCreditCardEditor(const base::ListValue* args) {
base::DictionaryValue credit_card_data;
credit_card_data.SetString("guid", credit_card->guid());
credit_card_data.SetString(
- "nameOnCard",
- credit_card->GetRawInfo(autofill::CREDIT_CARD_NAME));
+ "nameOnCard", credit_card->GetRawInfo(autofill::CREDIT_CARD_NAME_FULL));
credit_card_data.SetString(
"creditCardNumber",
credit_card->GetRawInfo(autofill::CREDIT_CARD_NUMBER));
@@ -543,7 +542,7 @@ void AutofillOptionsHandler::SetCreditCard(const base::ListValue* args) {
base::string16 value;
if (args->GetString(1, &value))
- credit_card.SetRawInfo(autofill::CREDIT_CARD_NAME, value);
+ credit_card.SetRawInfo(autofill::CREDIT_CARD_NAME_FULL, value);
if (args->GetString(2, &value))
credit_card.SetRawInfo(autofill::CREDIT_CARD_NUMBER, value);
generated by cgit v1.1 at 2025-12-01 03:36:39 +0000