PaymentRequest: Sync up PaymentAddress with the payment request spec.

third_party/WebKit/public/platform/modules/payments/payment_request.mojom

 // 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.
 
 [JavaPackage="org.chromium.mojom.payments"]
 module blink.mojom;
 
 // The shipping address that the browser process provides to the renderer
 // process. Built either by the browser or a payment app.
 struct PaymentAddress {
   // ISO 3166 country code. Two upper case ASCII letters.
-  string region_code;
+  string country;
 
   array<string> address_line;
-  string administrative_area;
-  string locality;
+  string region;
+  string city;
   string dependent_locality;
   string postal_code;
   string sorting_code;
 
   // Optional shortest ISO 639 language code. Two or three lower case ASCII
   // letters.
   string language_code;
 
   // Optional ISO 15924 script code. Four ASCII letters. The first letter is
   // upper case; the rest are lower case.
   string script_code;
 
   string organization;
   string recipient;
+  string careOf;
+  string phone;
 };
 
 struct PaymentResponse {
   string method_name;
 
   // Payment method specific JSON string that is built either by the browser or
   // a payment app, for example Android Pay. Browser ensures that the string can
   // be successfully parsed into base::JSONParser. Renderer parses this string
   // via v8::JSON::Parse() and hands off the result to the merchant website.
   // There's no one format for this object, so richer types cannot be used. A
@@ skipping 59 matching lines @@
        // object to the payment app, for example Android Pay. There's no one
        // format for this object, so richer types cannot be used. A simple
        // example:
        //
        // {"https://android.com/pay": {"gateway": "stripe"}}
        string stringified_data);
   UpdateWith(PaymentDetails details);
   Abort();
   Complete(bool success);
 };