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 29 matching lines @@
                 : "Country code should be in valid format";
 
         assert profile.getStreetAddress() != null : "Street address should not be null";
         assert profile.getRegion() != null : "Region should not be null";
         assert profile.getLocality() != null : "Locality should not be null";
         assert profile.getDependentLocality() != null : "Dependent locality should not be null";
         assert profile.getPostalCode() != null : "Postal code should not be null";
         assert profile.getSortingCode() != null : "Sorting code should not be null";
         assert profile.getCompanyName() != null : "Company name should not be null";
         assert profile.getFullName() != null : "Full name should not be null";
+        assert profile.getPhoneNumber() != null : "Phone number should not be null";

[please use gerrit instead, 2016/06/06 17:35:48]

To avoid hitting this assert, you should check for phone number here as well:

https://cs.chromium.org/chromium/src/chrome/android/java/src/org/chromium/chr...

To make sure that user is aware of their phone number being sent to the
merchant, you should add "suggested_fields->push_back(PHONE_HOME_WHOLE_NUMBER);"
here:

https://cs.chromium.org/chromium/src/chrome/browser/autofill/android/personal...

[zino, 2016/06/06 18:02:17]

Done.

 
         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();
         result.languageCode = "";
         result.scriptCode = "";
+        result.careOf = "";
+        result.phone = mProfile.getPhoneNumber();
 
         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;
     }
 }