| Index: components/test/data/autofill/merge/input/email.in
 | 
| diff --git a/components/test/data/autofill/merge/input/email.in b/components/test/data/autofill/merge/input/email.in
 | 
| index c970da0fd6fd8cfa742b778e724cd92fa0d9ea46..caa2b8f451082a71d13eb2bba0d2a5fbd6f6f87f 100644
 | 
| --- a/components/test/data/autofill/merge/input/email.in
 | 
| +++ b/components/test/data/autofill/merge/input/email.in
 | 
| @@ -2,10 +2,10 @@
 | 
|  NAME_FIRST: j@x.com
 | 
|  NAME_MIDDLE: Kilgore
 | 
|  NAME_LAST: Doe
 | 
| +NAME_FULL: 
 | 
|  EMAIL_ADDRESS: john.doe@example.com
 | 
|  COMPANY_NAME: TestCo
 | 
| -ADDRESS_HOME_LINE1: 1600 Amphitheatre Parkway
 | 
| -ADDRESS_HOME_LINE2: (Bldg. 1950)
 | 
| +ADDRESS_HOME_STREET_ADDRESS: 1600 Amphitheatre Parkway\\n(Bldg. 1950)
 | 
|  ADDRESS_HOME_CITY: Mountain View
 | 
|  ADDRESS_HOME_STATE: CA
 | 
|  ADDRESS_HOME_ZIP: 94043
 | 
| @@ -15,10 +15,10 @@ PHONE_HOME_WHOLE_NUMBER: 6505558888
 | 
|  NAME_FIRST: John
 | 
|  NAME_MIDDLE: j@x.com
 | 
|  NAME_LAST: Doe
 | 
| +NAME_FULL: 
 | 
|  EMAIL_ADDRESS: john.doe@example.com
 | 
|  COMPANY_NAME: TestCo
 | 
| -ADDRESS_HOME_LINE1: 1601 Amphitheatre Parkway
 | 
| -ADDRESS_HOME_LINE2: (Bldg. 1950)
 | 
| +ADDRESS_HOME_STREET_ADDRESS: 1601 Amphitheatre Parkway\\n(Bldg. 1950)
 | 
|  ADDRESS_HOME_CITY: Mountain View
 | 
|  ADDRESS_HOME_STATE: CA
 | 
|  ADDRESS_HOME_ZIP: 94043
 | 
| @@ -28,10 +28,10 @@ PHONE_HOME_WHOLE_NUMBER: 6505558888
 | 
|  NAME_FIRST: John
 | 
|  NAME_MIDDLE: Kilgore
 | 
|  NAME_LAST: j@x.com
 | 
| +NAME_FULL: 
 | 
|  EMAIL_ADDRESS: john.doe@example.com
 | 
|  COMPANY_NAME: TestCo
 | 
| -ADDRESS_HOME_LINE1: 1602 Amphitheatre Parkway
 | 
| -ADDRESS_HOME_LINE2: (Bldg. 1950)
 | 
| +ADDRESS_HOME_STREET_ADDRESS: 1602 Amphitheatre Parkway\\n(Bldg. 1950)
 | 
|  ADDRESS_HOME_CITY: Mountain View
 | 
|  ADDRESS_HOME_STATE: CA
 | 
|  ADDRESS_HOME_ZIP: 94043
 | 
| @@ -41,10 +41,10 @@ PHONE_HOME_WHOLE_NUMBER: 6505558888
 | 
|  NAME_FIRST: John
 | 
|  NAME_MIDDLE: Kilgore
 | 
|  NAME_LAST: Doe
 | 
| +NAME_FULL: 
 | 
|  EMAIL_ADDRESS: john.doe@example.com
 | 
|  COMPANY_NAME: j@x.com
 | 
| -ADDRESS_HOME_LINE1: 1603 Amphitheatre Parkway
 | 
| -ADDRESS_HOME_LINE2: (Bldg. 1950)
 | 
| +ADDRESS_HOME_STREET_ADDRESS: 1603 Amphitheatre Parkway\\n(Bldg. 1950)
 | 
|  ADDRESS_HOME_CITY: Mountain View
 | 
|  ADDRESS_HOME_STATE: CA
 | 
|  ADDRESS_HOME_ZIP: 94043
 | 
| @@ -54,10 +54,10 @@ PHONE_HOME_WHOLE_NUMBER: 6505558888
 | 
|  NAME_FIRST: John
 | 
|  NAME_MIDDLE: Kilgore
 | 
|  NAME_LAST: Doe
 | 
| +NAME_FULL: 
 | 
|  EMAIL_ADDRESS: john.doe@example.com
 | 
|  COMPANY_NAME: TestCo
 | 
| -ADDRESS_HOME_LINE1: j@x.com
 | 
| -ADDRESS_HOME_LINE2: (Bldg. 1950)
 | 
| +ADDRESS_HOME_STREET_ADDRESS: j@x.com\\n(Bldg. 1950)
 | 
|  ADDRESS_HOME_CITY: Mountain View
 | 
|  ADDRESS_HOME_STATE: CA
 | 
|  ADDRESS_HOME_ZIP: 94043
 | 
| @@ -67,10 +67,10 @@ PHONE_HOME_WHOLE_NUMBER: 6505558888
 | 
|  NAME_FIRST: John
 | 
|  NAME_MIDDLE: Kilgore
 | 
|  NAME_LAST: Doe
 | 
| +NAME_FULL: 
 | 
|  EMAIL_ADDRESS: john.doe@example.com
 | 
|  COMPANY_NAME: TestCo
 | 
| -ADDRESS_HOME_LINE1: 1604 Amphitheatre Parkway
 | 
| -ADDRESS_HOME_LINE2: j@x.com
 | 
| +ADDRESS_HOME_STREET_ADDRESS: 1604 Amphitheatre Parkway\\nj@x.com
 | 
|  ADDRESS_HOME_CITY: Mountain View
 | 
|  ADDRESS_HOME_STATE: CA
 | 
|  ADDRESS_HOME_ZIP: 94043
 | 
| @@ -80,10 +80,10 @@ PHONE_HOME_WHOLE_NUMBER: 6505558888
 | 
|  NAME_FIRST: John
 | 
|  NAME_MIDDLE: Kilgore
 | 
|  NAME_LAST: Doe
 | 
| +NAME_FULL: 
 | 
|  EMAIL_ADDRESS: john.doe@example.com
 | 
|  COMPANY_NAME: TestCo
 | 
| -ADDRESS_HOME_LINE1: 1605 Amphitheatre Parkway
 | 
| -ADDRESS_HOME_LINE2: (Bldg. 1950)
 | 
| +ADDRESS_HOME_STREET_ADDRESS: 1605 Amphitheatre Parkway\\n(Bldg. 1950)
 | 
|  ADDRESS_HOME_CITY: j@x.com
 | 
|  ADDRESS_HOME_STATE: CA
 | 
|  ADDRESS_HOME_ZIP: 94043
 | 
| @@ -93,10 +93,10 @@ PHONE_HOME_WHOLE_NUMBER: 6505558888
 | 
|  NAME_FIRST: John
 | 
|  NAME_MIDDLE: Kilgore
 | 
|  NAME_LAST: Doe
 | 
| +NAME_FULL: 
 | 
|  EMAIL_ADDRESS: john.doe@example.com
 | 
|  COMPANY_NAME: TestCo
 | 
| -ADDRESS_HOME_LINE1: 1606 Amphitheatre Parkway
 | 
| -ADDRESS_HOME_LINE2: (Bldg. 1950)
 | 
| +ADDRESS_HOME_STREET_ADDRESS: 1606 Amphitheatre Parkway\\n(Bldg. 1950)
 | 
|  ADDRESS_HOME_CITY: Mountain View
 | 
|  ADDRESS_HOME_STATE: j@x.com
 | 
|  ADDRESS_HOME_ZIP: 94043
 | 
| @@ -106,10 +106,10 @@ PHONE_HOME_WHOLE_NUMBER: 6505558888
 | 
|  NAME_FIRST: John
 | 
|  NAME_MIDDLE: Kilgore
 | 
|  NAME_LAST: Doe
 | 
| +NAME_FULL: 
 | 
|  EMAIL_ADDRESS: john.doe@example.com
 | 
|  COMPANY_NAME: TestCo
 | 
| -ADDRESS_HOME_LINE1: 1607 Amphitheatre Parkway
 | 
| -ADDRESS_HOME_LINE2: (Bldg. 1950)
 | 
| +ADDRESS_HOME_STREET_ADDRESS: 1607 Amphitheatre Parkway\\n(Bldg. 1950)
 | 
|  ADDRESS_HOME_CITY: Mountain View
 | 
|  ADDRESS_HOME_STATE: CA
 | 
|  ADDRESS_HOME_ZIP: j@x.com
 | 
| @@ -119,10 +119,10 @@ PHONE_HOME_WHOLE_NUMBER: 6505558888
 | 
|  NAME_FIRST: John
 | 
|  NAME_MIDDLE: Kilgore
 | 
|  NAME_LAST: Doe
 | 
| +NAME_FULL: 
 | 
|  EMAIL_ADDRESS: john.doe@example.com
 | 
|  COMPANY_NAME: TestCo
 | 
| -ADDRESS_HOME_LINE1: 1608 Amphitheatre Parkway
 | 
| -ADDRESS_HOME_LINE2: (Bldg. 1950)
 | 
| +ADDRESS_HOME_STREET_ADDRESS: 1608 Amphitheatre Parkway\\n(Bldg. 1950)
 | 
|  ADDRESS_HOME_CITY: Mountain View
 | 
|  ADDRESS_HOME_STATE: CA
 | 
|  ADDRESS_HOME_ZIP: 94043
 | 
| @@ -132,10 +132,10 @@ PHONE_HOME_WHOLE_NUMBER: 6505558888
 | 
|  NAME_FIRST: John
 | 
|  NAME_MIDDLE: Kilgore
 | 
|  NAME_LAST: Doe
 | 
| +NAME_FULL: 
 | 
|  EMAIL_ADDRESS: john.doe@example.com
 | 
|  COMPANY_NAME: TestCo
 | 
| -ADDRESS_HOME_LINE1: 1609 Amphitheatre Parkway
 | 
| -ADDRESS_HOME_LINE2: (Bldg. 1950)
 | 
| +ADDRESS_HOME_STREET_ADDRESS: 1609 Amphitheatre Parkway\\n(Bldg. 1950)
 | 
|  ADDRESS_HOME_CITY: Mountain View
 | 
|  ADDRESS_HOME_STATE: CA
 | 
|  ADDRESS_HOME_ZIP: 94043
 | 
| 
 |