summaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorisherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-24 02:49:04 +0000
committerisherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-24 02:49:04 +0000
commitaf642a68e3e0dbbaf27442e0b234f3d257467404 (patch)
tree6857183ed5b72b93df34321e70c320bf5816c82a /components
parentdd9e8769a3da6189af0ddb0c33483d5b6e0ae878 (diff)
downloadchromium_src-af642a68e3e0dbbaf27442e0b234f3d257467404.zip
chromium_src-af642a68e3e0dbbaf27442e0b234f3d257467404.tar.gz
chromium_src-af642a68e3e0dbbaf27442e0b234f3d257467404.tar.bz2
[Autofill] Temporarily drop support for street-address autocomplete type.
Bug 261978 tracks re-adding this support correctly. BUG=261720,261978 R=abodenha@chromium.org Review URL: https://chromiumcodereview.appspot.com/19528007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213323 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components')
-rw-r--r--components/autofill/core/browser/autofill_manager_unittest.cc2
-rw-r--r--components/autofill/core/browser/autofill_metrics_unittest.cc2
-rw-r--r--components/autofill/core/browser/form_structure.cc3
-rw-r--r--components/autofill/core/browser/form_structure_unittest.cc6
4 files changed, 6 insertions, 7 deletions
diff --git a/components/autofill/core/browser/autofill_manager_unittest.cc b/components/autofill/core/browser/autofill_manager_unittest.cc
index 35b1e6a0..639d733e 100644
--- a/components/autofill/core/browser/autofill_manager_unittest.cc
+++ b/components/autofill/core/browser/autofill_manager_unittest.cc
@@ -2076,7 +2076,7 @@ TEST_F(AutofillManagerTest, FillFormWithAuthorSpecifiedSections) {
form.fields.push_back(field);
test::CreateTestFormField("", "address", "", "text", &field);
- field.autocomplete_attribute = "section-billing street-address";
+ field.autocomplete_attribute = "section-billing address-line1";
form.fields.push_back(field);
test::CreateTestFormField("", "city", "", "text", &field);
diff --git a/components/autofill/core/browser/autofill_metrics_unittest.cc b/components/autofill/core/browser/autofill_metrics_unittest.cc
index 8b83255..ce125fa 100644
--- a/components/autofill/core/browser/autofill_metrics_unittest.cc
+++ b/components/autofill/core/browser/autofill_metrics_unittest.cc
@@ -808,7 +808,7 @@ TEST_F(AutofillMetricsTest, DeveloperEngagement) {
field.autocomplete_attribute = "email";
forms.back().fields.push_back(field);
test::CreateTestFormField("", "", "", "text", &field);
- field.autocomplete_attribute = "street-address";
+ field.autocomplete_attribute = "address-line1";
forms.back().fields.push_back(field);
// Expect both the "form parsed" metric and the author-specified field type
diff --git a/components/autofill/core/browser/form_structure.cc b/components/autofill/core/browser/form_structure.cc
index ff3f84e..0e97d98 100644
--- a/components/autofill/core/browser/form_structure.cc
+++ b/components/autofill/core/browser/form_structure.cc
@@ -210,8 +210,7 @@ AutofillFieldType FieldTypeFromAutocompleteType(
if (autocomplete_type == "organization")
return COMPANY_NAME;
- if (autocomplete_type == "street-address" ||
- autocomplete_type == "address-line1")
+ if (autocomplete_type == "address-line1")
return ADDRESS_HOME_LINE1;
if (autocomplete_type == "address-line2")
diff --git a/components/autofill/core/browser/form_structure_unittest.cc b/components/autofill/core/browser/form_structure_unittest.cc
index 995cfd3..0c78751 100644
--- a/components/autofill/core/browser/form_structure_unittest.cc
+++ b/components/autofill/core/browser/form_structure_unittest.cc
@@ -673,7 +673,7 @@ TEST(FormStructureTest, HeuristicsAutocompleteAttributeWithSectionsRepeated) {
field.autocomplete_attribute = "section-foo email";
form.fields.push_back(field);
- field.autocomplete_attribute = "section-foo street-address";
+ field.autocomplete_attribute = "section-foo address-line1";
form.fields.push_back(field);
FormStructure form_structure(form, std::string());
@@ -702,7 +702,7 @@ TEST(FormStructureTest, HeuristicsDontOverrideAutocompleteAttributeSections) {
field.form_control_type = "text";
field.name = ASCIIToUTF16("one");
- field.autocomplete_attribute = "street-address";
+ field.autocomplete_attribute = "address-line1";
form.fields.push_back(field);
field.name = base::string16();
field.autocomplete_attribute = "section-foo email";
@@ -711,7 +711,7 @@ TEST(FormStructureTest, HeuristicsDontOverrideAutocompleteAttributeSections) {
field.autocomplete_attribute = "name";
form.fields.push_back(field);
field.name = ASCIIToUTF16("two");
- field.autocomplete_attribute = "street-address";
+ field.autocomplete_attribute = "address-line1";
form.fields.push_back(field);
FormStructure form_structure(form, std::string());