PaymentRequest: Sync up PaymentAddress with the payment request spec.

chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillAddress.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.chrome.browser.payments.ui.PaymentOption;
 import org.chromium.mojom.payments.PaymentAddress;
 
@@ skipping 39 matching lines @@
 
         mProfile = profile;
     }
 
     /**
      * Returns the shipping address for mojo.
      */
     public PaymentAddress toPaymentAddress() {
         PaymentAddress result = new PaymentAddress();
 
-        result.regionCode = mProfile.getCountryCode();
+        result.country = mProfile.getCountryCode();
         result.addressLine = mProfile.getStreetAddress().split("\n");
-        result.administrativeArea = mProfile.getRegion();
-        result.locality = mProfile.getLocality();
+        result.region = mProfile.getRegion();
+        result.city = mProfile.getLocality();
         result.dependentLocality = mProfile.getDependentLocality();
         result.postalCode = mProfile.getPostalCode();
         result.sortingCode = mProfile.getSortingCode();
         result.organization = mProfile.getCompanyName();
         result.recipient = mProfile.getFullName();

[please use gerrit instead, 2016/06/06 16:01:14]

Please also add "careOf" and "phone".

result.careOf = "";
result.phone = mProfile.getPhoneNumber();

[zino, 2016/06/06 17:23:15]

Done.

         result.languageCode = "";
         result.scriptCode = "";
 
         if (mProfile.getLanguageCode() == null) return result;
 
         if (mLanguageScriptCodeMatcher == null) {
             mLanguageScriptCodeMatcher = Pattern.compile(LANGUAGE_SCRIPT_CODE_PATTERN)
                                                  .matcher(mProfile.getLanguageCode());
         }
 
         if (mLanguageScriptCodeMatcher.matches()) {
             String languageCode = mLanguageScriptCodeMatcher.group(LANGUAGE_CODE_GROUP);
             result.languageCode = languageCode != null ? languageCode : "";
 
             String scriptCode = mLanguageScriptCodeMatcher.group(SCRIPT_CODE_GROUP);
             result.scriptCode = scriptCode != null ? scriptCode : "";
         }
 
         return result;
     }
 }