PaymentRequest: Sync up PaymentAddress with the payment request spec.

third_party/WebKit/Source/modules/payments/PaymentRequestTest.cpp

 // 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.
 
 #include "modules/payments/PaymentRequest.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/JSONValuesForV8.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/ExceptionCode.h"
@@ skipping 205 matching lines @@
 
     static_cast<mojom::blink::PaymentRequestClient*>(request)->OnPaymentResponse(std::move(response));
 }
 
 TEST_F(PaymentRequestTest, DontRejectShowPromiseForValidShippingAddress)
 {
     ScriptState::Scope scope(getScriptState());
     PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), buildPaymentDetailsForTest(), getExceptionState());
     EXPECT_FALSE(getExceptionState().hadException());
     mojom::blink::PaymentAddressPtr shippingAddress = mojom::blink::PaymentAddress::New();
-    shippingAddress->region_code = "US";
+    shippingAddress->country = "US";
     shippingAddress->language_code = "en";
     shippingAddress->script_code = "Latn";
 
     request->show(getScriptState()).then(MockFunction::expectNoCall(getScriptState()), MockFunction::expectNoCall(getScriptState()));
 
     static_cast<mojom::blink::PaymentRequestClient*>(request)->OnShippingAddressChange(std::move(shippingAddress));
 }
 
 TEST_F(PaymentRequestTest, ResolveShowPromiseWithValidShippingAddressInResponse)
 {
     ScriptState::Scope scope(getScriptState());
     PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), buildPaymentDetailsForTest(), getExceptionState());
     EXPECT_FALSE(getExceptionState().hadException());
     mojom::blink::PaymentResponsePtr response = mojom::blink::PaymentResponse::New();
     response->shipping_address = mojom::blink::PaymentAddress::New();
-    response->shipping_address->region_code = "US";
+    response->shipping_address->country = "US";
     response->shipping_address->language_code = "en";
     response->shipping_address->script_code = "Latn";
 
     request->show(getScriptState()).then(MockFunction::expectCall(getScriptState()), MockFunction::expectNoCall(getScriptState()));
 
     static_cast<mojom::blink::PaymentRequestClient*>(request)->OnPaymentResponse(std::move(response));
 }
 
 TEST_F(PaymentRequestTest, ResolveShowPromiseWithoutShippingAddressInResponse)
 {
@@ skipping 188 matching lines @@
         "\"shippingOptions\": [{\"id\": \"standardShippingOption\", \"label\": \"Standard shipping\", \"amount\": {\"currency\": \"USD\", \"value\": \"5.00\"}}]}";
 
     request->onUpdatePaymentDetails(ScriptValue::from(getScriptState(), fromJSONString(getScriptState(), detail, getExceptionState())));
     EXPECT_FALSE(getExceptionState().hadException());
 
     EXPECT_EQ("standardShippingOption", request->shippingOption());
 }
 
 } // namespace
 } // namespace blink