| Index: chrome/test/data/autofill/merge/input/email.in
|
| diff --git a/chrome/test/data/autofill/merge/input/email.in b/chrome/test/data/autofill/merge/input/email.in
|
| index f36ccd694990438d968d367e4ca91c813f35fbb5..c970da0fd6fd8cfa742b778e724cd92fa0d9ea46 100644
|
| --- a/chrome/test/data/autofill/merge/input/email.in
|
| +++ b/chrome/test/data/autofill/merge/input/email.in
|
| @@ -11,7 +11,6 @@ ADDRESS_HOME_STATE: CA
|
| ADDRESS_HOME_ZIP: 94043
|
| ADDRESS_HOME_COUNTRY: United States
|
| PHONE_HOME_WHOLE_NUMBER: 6505558888
|
| -PHONE_FAX_WHOLE_NUMBER: 6505556789
|
| ---
|
| NAME_FIRST: John
|
| NAME_MIDDLE: j@x.com
|
| @@ -25,7 +24,6 @@ ADDRESS_HOME_STATE: CA
|
| ADDRESS_HOME_ZIP: 94043
|
| ADDRESS_HOME_COUNTRY: United States
|
| PHONE_HOME_WHOLE_NUMBER: 6505558888
|
| -PHONE_FAX_WHOLE_NUMBER: 6505556789
|
| ---
|
| NAME_FIRST: John
|
| NAME_MIDDLE: Kilgore
|
| @@ -39,7 +37,6 @@ ADDRESS_HOME_STATE: CA
|
| ADDRESS_HOME_ZIP: 94043
|
| ADDRESS_HOME_COUNTRY: United States
|
| PHONE_HOME_WHOLE_NUMBER: 6505558888
|
| -PHONE_FAX_WHOLE_NUMBER: 6505556789
|
| ---
|
| NAME_FIRST: John
|
| NAME_MIDDLE: Kilgore
|
| @@ -53,7 +50,6 @@ ADDRESS_HOME_STATE: CA
|
| ADDRESS_HOME_ZIP: 94043
|
| ADDRESS_HOME_COUNTRY: United States
|
| PHONE_HOME_WHOLE_NUMBER: 6505558888
|
| -PHONE_FAX_WHOLE_NUMBER: 6505556789
|
| ---
|
| NAME_FIRST: John
|
| NAME_MIDDLE: Kilgore
|
| @@ -67,7 +63,6 @@ ADDRESS_HOME_STATE: CA
|
| ADDRESS_HOME_ZIP: 94043
|
| ADDRESS_HOME_COUNTRY: United States
|
| PHONE_HOME_WHOLE_NUMBER: 6505558888
|
| -PHONE_FAX_WHOLE_NUMBER: 6505556789
|
| ---
|
| NAME_FIRST: John
|
| NAME_MIDDLE: Kilgore
|
| @@ -81,7 +76,6 @@ ADDRESS_HOME_STATE: CA
|
| ADDRESS_HOME_ZIP: 94043
|
| ADDRESS_HOME_COUNTRY: United States
|
| PHONE_HOME_WHOLE_NUMBER: 6505558888
|
| -PHONE_FAX_WHOLE_NUMBER: 6505556789
|
| ---
|
| NAME_FIRST: John
|
| NAME_MIDDLE: Kilgore
|
| @@ -95,7 +89,6 @@ ADDRESS_HOME_STATE: CA
|
| ADDRESS_HOME_ZIP: 94043
|
| ADDRESS_HOME_COUNTRY: United States
|
| PHONE_HOME_WHOLE_NUMBER: 6505558888
|
| -PHONE_FAX_WHOLE_NUMBER: 6505556789
|
| ---
|
| NAME_FIRST: John
|
| NAME_MIDDLE: Kilgore
|
| @@ -109,7 +102,6 @@ ADDRESS_HOME_STATE: j@x.com
|
| ADDRESS_HOME_ZIP: 94043
|
| ADDRESS_HOME_COUNTRY: United States
|
| PHONE_HOME_WHOLE_NUMBER: 6505558888
|
| -PHONE_FAX_WHOLE_NUMBER: 6505556789
|
| ---
|
| NAME_FIRST: John
|
| NAME_MIDDLE: Kilgore
|
| @@ -123,7 +115,6 @@ ADDRESS_HOME_STATE: CA
|
| ADDRESS_HOME_ZIP: j@x.com
|
| ADDRESS_HOME_COUNTRY: United States
|
| PHONE_HOME_WHOLE_NUMBER: 6505558888
|
| -PHONE_FAX_WHOLE_NUMBER: 6505556789
|
| ---
|
| NAME_FIRST: John
|
| NAME_MIDDLE: Kilgore
|
| @@ -137,7 +128,6 @@ ADDRESS_HOME_STATE: CA
|
| ADDRESS_HOME_ZIP: 94043
|
| ADDRESS_HOME_COUNTRY: j@x.com
|
| PHONE_HOME_WHOLE_NUMBER: 6505558888
|
| -PHONE_FAX_WHOLE_NUMBER: 6505556789
|
| ---
|
| NAME_FIRST: John
|
| NAME_MIDDLE: Kilgore
|
| @@ -151,18 +141,3 @@ ADDRESS_HOME_STATE: CA
|
| ADDRESS_HOME_ZIP: 94043
|
| ADDRESS_HOME_COUNTRY: United States
|
| PHONE_HOME_WHOLE_NUMBER: j@x.com
|
| -PHONE_FAX_WHOLE_NUMBER: 6505556789
|
| ----
|
| -NAME_FIRST: John
|
| -NAME_MIDDLE: Kilgore
|
| -NAME_LAST: Doe
|
| -EMAIL_ADDRESS: john.doe@example.com
|
| -COMPANY_NAME: TestCo
|
| -ADDRESS_HOME_LINE1: 1610 Amphitheatre Parkway
|
| -ADDRESS_HOME_LINE2: (Bldg. 1950)
|
| -ADDRESS_HOME_CITY: Mountain View
|
| -ADDRESS_HOME_STATE: CA
|
| -ADDRESS_HOME_ZIP: 94043
|
| -ADDRESS_HOME_COUNTRY: United States
|
| -PHONE_HOME_WHOLE_NUMBER: 6505558888
|
| -PHONE_FAX_WHOLE_NUMBER: j@x.com
|
|
|