| Index: components/test/data/autofill/merge/input/validation.in
 | 
| diff --git a/components/test/data/autofill/merge/input/validation.in b/components/test/data/autofill/merge/input/validation.in
 | 
| index 634f23fdaa16923d97d460362a8af61de8a77a0a..1a5c534fbaab6382666989a134610fbb3de9227f 100644
 | 
| --- a/components/test/data/autofill/merge/input/validation.in
 | 
| +++ b/components/test/data/autofill/merge/input/validation.in
 | 
| @@ -1,10 +1,10 @@
 | 
|  ---
 | 
|  NAME_FIRST: John
 | 
|  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
 | 
| @@ -13,8 +13,9 @@ PHONE_HOME_WHOLE_NUMBER: 6505558888
 | 
|  ---
 | 
|  NAME_FIRST: John
 | 
|  NAME_LAST: Doe
 | 
| +NAME_FULL: 
 | 
|  EMAIL_ADDRESS: john.doe@example.com
 | 
| -ADDRESS_HOME_LINE1: 1600 Amphitheatre Parkway
 | 
| +ADDRESS_HOME_STREET_ADDRESS: 1600 Amphitheatre Parkway
 | 
|  ADDRESS_HOME_CITY: Mountain View
 | 
|  ADDRESS_HOME_STATE: CA
 | 
|  ADDRESS_HOME_ZIP: 94043
 | 
| @@ -23,16 +24,18 @@ PHONE_HOME_WHOLE_NUMBER: 6505558888
 | 
|  ---
 | 
|  NAME_FIRST: Jim
 | 
|  NAME_LAST: Smith
 | 
| +NAME_FULL: 
 | 
|  EMAIL_ADDRESS: john.doe@example.com
 | 
| -ADDRESS_HOME_LINE2: Apt 2
 | 
| +ADDRESS_HOME_STREET_ADDRESS: \\nApt 2
 | 
|  ADDRESS_HOME_CITY: Mountain View
 | 
|  ADDRESS_HOME_STATE: CA
 | 
|  ADDRESS_HOME_ZIP: 94043
 | 
|  ---
 | 
|  NAME_FIRST: David
 | 
|  NAME_LAST: Smith
 | 
| +NAME_FULL: 
 | 
|  EMAIL_ADDRESS: bademail
 | 
| -ADDRESS_HOME_LINE1: 4 Main Street
 | 
| +ADDRESS_HOME_STREET_ADDRESS: 4 Main Street
 | 
|  ADDRESS_HOME_CITY: Mountain View
 | 
|  ADDRESS_HOME_STATE: CA
 | 
|  ADDRESS_HOME_ZIP: 94043
 | 
| @@ -40,9 +43,9 @@ ADDRESS_HOME_COUNTRY: United States
 | 
|  ---
 | 
|  NAME_FIRST: Jane
 | 
|  NAME_LAST: Smith
 | 
| +NAME_FULL: 
 | 
|  EMAIL_ADDRESS: jane.smith@example.com
 | 
| -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
 | 
| @@ -51,9 +54,9 @@ PHONE_HOME_WHOLE_NUMBER: 6505558888
 | 
|  ---
 | 
|  NAME_FIRST: Joe
 | 
|  NAME_LAST: Jones
 | 
| +NAME_FULL: 
 | 
|  EMAIL_ADDRESS: joejones@example.com
 | 
| -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: BadState
 | 
|  ADDRESS_HOME_ZIP: 94043
 | 
| @@ -62,9 +65,9 @@ PHONE_HOME_WHOLE_NUMBER: 6505558888
 | 
|  ---
 | 
|  NAME_FIRST: Jim
 | 
|  NAME_LAST: Jones
 | 
| +NAME_FULL: 
 | 
|  EMAIL_ADDRESS: jimjones@example.com
 | 
| -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: bogus
 | 
| 
 |