diff options
| author | estade <estade@chromium.org> | 2015-06-05 15:30:01 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-05 22:31:16 +0000 |
| commit | 431dfb72aedd23675487fc8df3ac927305fc494d (patch) | |
| tree | ad173968895968abe7abcd85bc851292b6ca49af /components/test | |
| parent | 7c4a13b0f04027293aecec40dc91544307f29746 (diff) | |
| download | chromium_src-431dfb72aedd23675487fc8df3ac927305fc494d.zip chromium_src-431dfb72aedd23675487fc8df3ac927305fc494d.tar.gz chromium_src-431dfb72aedd23675487fc8df3ac927305fc494d.tar.bz2 | |
More work on removing variants from Autofill
This patch has some substantive changes that are not just code deletion, mainly around syncing/merging behavior.
BUG=493856
TBR=zea@chromium.org
Review URL: https://codereview.chromium.org/1143253012
Cr-Commit-Position: refs/heads/master@{#333155}
Diffstat (limited to 'components/test')
4 files changed, 25 insertions, 48 deletions
diff --git a/components/test/data/autofill/merge/input/multimerge.in b/components/test/data/autofill/merge/input/multimerge.in deleted file mode 100644 index 5e4ef80..0000000 --- a/components/test/data/autofill/merge/input/multimerge.in +++ /dev/null @@ -1,26 +0,0 @@ ---- -NAME_FIRST: Alice -NAME_MIDDLE: Anne -NAME_LAST: Akins -EMAIL_ADDRESS: aa@a.com -COMPANY_NAME: Acme -ADDRESS_HOME_LINE1: 1 Main Street -ADDRESS_HOME_LINE2: Apt 1 -ADDRESS_HOME_CITY: San Francisco -ADDRESS_HOME_STATE: CA -ADDRESS_HOME_ZIP: 94102 -ADDRESS_HOME_COUNTRY: United States -PHONE_HOME_WHOLE_NUMBER: 16502101111 ---- -NAME_FIRST: Billy -NAME_MIDDLE: Bob -NAME_LAST: Bruner -EMAIL_ADDRESS: bb@b.com -COMPANY_NAME: Acme -ADDRESS_HOME_LINE1: 1 Main Street -ADDRESS_HOME_LINE2: Apt 1 -ADDRESS_HOME_CITY: San Francisco -ADDRESS_HOME_STATE: CA -ADDRESS_HOME_ZIP: 94102 -ADDRESS_HOME_COUNTRY: United States -PHONE_HOME_WHOLE_NUMBER: 6502343333 diff --git a/components/test/data/autofill/merge/output/multimerge.out b/components/test/data/autofill/merge/output/multimerge.out deleted file mode 100644 index 9120c75..0000000 --- a/components/test/data/autofill/merge/output/multimerge.out +++ /dev/null @@ -1,18 +0,0 @@ ---- -NAME_FIRST: Alice -NAME_FIRST: Billy -NAME_MIDDLE: Anne -NAME_MIDDLE: Bob -NAME_LAST: Akins -NAME_LAST: Bruner -EMAIL_ADDRESS: aa@a.com -EMAIL_ADDRESS: bb@b.com -COMPANY_NAME: Acme -ADDRESS_HOME_LINE1: 1 Main Street -ADDRESS_HOME_LINE2: Apt 1 -ADDRESS_HOME_CITY: San Francisco -ADDRESS_HOME_STATE: CA -ADDRESS_HOME_ZIP: 94102 -ADDRESS_HOME_COUNTRY: US -PHONE_HOME_WHOLE_NUMBER: 1 650-210-1111 -PHONE_HOME_WHOLE_NUMBER: (650) 234-3333 diff --git a/components/test/data/autofill/merge/output/primarycase.out b/components/test/data/autofill/merge/output/primarycase.out index 9120c75..2006203 100644 --- a/components/test/data/autofill/merge/output/primarycase.out +++ b/components/test/data/autofill/merge/output/primarycase.out @@ -1,12 +1,8 @@ --- NAME_FIRST: Alice -NAME_FIRST: Billy NAME_MIDDLE: Anne -NAME_MIDDLE: Bob NAME_LAST: Akins -NAME_LAST: Bruner EMAIL_ADDRESS: aa@a.com -EMAIL_ADDRESS: bb@b.com COMPANY_NAME: Acme ADDRESS_HOME_LINE1: 1 Main Street ADDRESS_HOME_LINE2: Apt 1 @@ -15,4 +11,16 @@ ADDRESS_HOME_STATE: CA ADDRESS_HOME_ZIP: 94102 ADDRESS_HOME_COUNTRY: US PHONE_HOME_WHOLE_NUMBER: 1 650-210-1111 +--- +NAME_FIRST: Billy +NAME_MIDDLE: Bob +NAME_LAST: Bruner +EMAIL_ADDRESS: bb@b.com +COMPANY_NAME: Acme +ADDRESS_HOME_LINE1: 1 MAIN STREET +ADDRESS_HOME_LINE2: Apt 1 +ADDRESS_HOME_CITY: SAN FRANCISCO +ADDRESS_HOME_STATE: CA +ADDRESS_HOME_ZIP: 94102 +ADDRESS_HOME_COUNTRY: US PHONE_HOME_WHOLE_NUMBER: (650) 234-3333 diff --git a/components/test/data/autofill/merge/output/singlemerge.out b/components/test/data/autofill/merge/output/singlemerge.out index 17e2663..f90b61b 100644 --- a/components/test/data/autofill/merge/output/singlemerge.out +++ b/components/test/data/autofill/merge/output/singlemerge.out @@ -3,6 +3,19 @@ NAME_FIRST: Alice NAME_MIDDLE: Anne NAME_LAST: Akins EMAIL_ADDRESS: aa@a.com +COMPANY_NAME: Acme +ADDRESS_HOME_LINE1: 1 Main Street +ADDRESS_HOME_LINE2: Apt 1 +ADDRESS_HOME_CITY: San Francisco +ADDRESS_HOME_STATE: CA +ADDRESS_HOME_ZIP: 94102 +ADDRESS_HOME_COUNTRY: US +PHONE_HOME_WHOLE_NUMBER: 1 650-210-1111 +--- +NAME_FIRST: Alice +NAME_MIDDLE: Anne +NAME_LAST: Akins +EMAIL_ADDRESS: aa@a.com COMPANY_NAME: Box Co ADDRESS_HOME_LINE1: 1 Main Street ADDRESS_HOME_LINE2: Apt 2 |