| Index: components/autofill/core/browser/webdata/autofill_table.cc
|
| diff --git a/components/autofill/core/browser/webdata/autofill_table.cc b/components/autofill/core/browser/webdata/autofill_table.cc
|
| index 07955b29ce45d754ec5b736b3ec430fba0955fc3..9066d9c0df0c8cf151f4d7f87bed3d2985e5d4ed 100644
|
| --- a/components/autofill/core/browser/webdata/autofill_table.cc
|
| +++ b/components/autofill/core/browser/webdata/autofill_table.cc
|
| @@ -72,7 +72,7 @@ void BindAutofillProfileToStatement(const AutofillProfile& profile,
|
| s->BindString16(5, LimitDataSize(text));
|
| text = profile.GetRawInfo(ADDRESS_HOME_ZIP);
|
| s->BindString16(6, LimitDataSize(text));
|
| - text = profile.GetInfo(ADDRESS_HOME_COUNTRY, app_locale);
|
| + text = profile.GetInfo(AutofillType(ADDRESS_HOME_COUNTRY), app_locale);
|
| s->BindString16(7, LimitDataSize(text));
|
| text = profile.GetRawInfo(ADDRESS_HOME_COUNTRY);
|
| s->BindString16(8, LimitDataSize(text));
|
| @@ -1928,7 +1928,8 @@ bool AutofillTable::MigrateToVersion33ProfilesBasedOnFirstName() {
|
| profile.SetRawInfo(ADDRESS_HOME_CITY, s.ColumnString16(8));
|
| profile.SetRawInfo(ADDRESS_HOME_STATE, s.ColumnString16(9));
|
| profile.SetRawInfo(ADDRESS_HOME_ZIP, s.ColumnString16(10));
|
| - profile.SetInfo(ADDRESS_HOME_COUNTRY, s.ColumnString16(11), app_locale_);
|
| + profile.SetInfo(AutofillType(ADDRESS_HOME_COUNTRY), s.ColumnString16(11),
|
| + app_locale_);
|
| profile.SetRawInfo(PHONE_HOME_WHOLE_NUMBER, s.ColumnString16(12));
|
| int64 date_modified = s.ColumnInt64(13);
|
|
|
| @@ -2151,7 +2152,7 @@ bool AutofillTable::MigrateToVersion37MergeAndCullOlderProfiles() {
|
| s.BindString16(5, LimitDataSize(text));
|
| text = iter->GetRawInfo(ADDRESS_HOME_ZIP);
|
| s.BindString16(6, LimitDataSize(text));
|
| - text = iter->GetInfo(ADDRESS_HOME_COUNTRY, app_locale_);
|
| + text = iter->GetInfo(AutofillType(ADDRESS_HOME_COUNTRY), app_locale_);
|
| s.BindString16(7, LimitDataSize(text));
|
| text = iter->GetRawInfo(ADDRESS_HOME_COUNTRY);
|
| s.BindString16(8, LimitDataSize(text));
|
|
|