PaymentRequest: Sync up PaymentAddress with the payment request spec.

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.payments;
 
 import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
 import org.chromium.mojom.payments.PaymentAddress;
 import org.chromium.testing.local.LocalRobolectricTestRunner;
 import org.junit.Assert;
@@ skipping 22 matching lines @@
         Assert.assertFalse(pattern.matcher("").matches());
     }
 
     @Test
     public void testToPaymentAddress() {
         AutofillAddress input = new AutofillAddress(new AutofillProfile("guid", "origin",
                 true /* isLocal */, "full name", "company name", "street\naddress", "region",
                 "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);
         Assert.assertEquals("company name", output.organization);
         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
     public void testToPaymentAddressWithoutMatchingLanguageScriptCode() {
         AutofillAddress input = new AutofillAddress(new AutofillProfile("guid", "origin",
                 true /* isLocal */, "full name", "company name", "street\naddress", "region",
                 "locality", "dependent locality", "postal code", "sorting code", "US",
                 "phone number", "email@address.com", "language-code"));
         PaymentAddress output = input.toPaymentAddress();
         Assert.assertEquals("", output.languageCode);
@@ skipping 29 matching lines @@
                 "locality", "dependent locality", "postal code", "sorting code", "US",
                 "phone number", "email@address.com", "en-Latn"));
         PaymentAddress output1 = input.toPaymentAddress();
         PaymentAddress output2 = input.toPaymentAddress();
         Assert.assertEquals("en", output1.languageCode);
         Assert.assertEquals("en", output2.languageCode);
         Assert.assertEquals("Latn", output1.scriptCode);
         Assert.assertEquals("Latn", output2.scriptCode);
     }
 }