PaymentRequest: Sync up PaymentAddress with the payment request spec.

chrome/android/junit/src/org/chromium/chrome/browser/payments/AutofillAddressTest.java

Index: chrome/android/junit/src/org/chromium/chrome/browser/payments/AutofillAddressTest.java
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/payments/AutofillAddressTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/payments/AutofillAddressTest.java
index d3e07166999bab8fd13be846a94e5da6b6043fd1..6c604232e03bf7cec46eaf08c3efca1d206bc1b0 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/payments/AutofillAddressTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/payments/AutofillAddressTest.java
@@ -40,10 +40,10 @@ public class AutofillAddressTest {
                 "locality", "dependent locality", "postal code", "sorting code", "US",
                 "phone number", "email@address.com", "en-Latn-US"));
         PaymentAddress output = input.toPaymentAddress();
-        Assert.assertEquals("US", output.regionCode);
+        Assert.assertEquals("US", output.country);
         Assert.assertArrayEquals(new String[]{"street", "address"}, output.addressLine);
-        Assert.assertEquals("region", output.administrativeArea);
-        Assert.assertEquals("locality", output.locality);
+        Assert.assertEquals("region", output.region);
+        Assert.assertEquals("locality", output.city);
         Assert.assertEquals("dependent locality", output.dependentLocality);
         Assert.assertEquals("postal code", output.postalCode);
         Assert.assertEquals("sorting code", output.sortingCode);
@@ -51,6 +51,8 @@ public class AutofillAddressTest {
         Assert.assertEquals("full name", output.recipient);
         Assert.assertEquals("en", output.languageCode);
         Assert.assertEquals("Latn", output.scriptCode);
+        Assert.assertEquals("", output.careOf);
+        Assert.assertEquals("phone number", output.phone);
     }
 
     @Test