PaymentRequest: Rename ShippingAddress to PaymentAddress.

third_party/WebKit/Source/modules/payments/PaymentRequest.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/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/modules/v8/V8PaymentDetails.h"
 #include "core/EventTypeNames.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/events/Event.h"
 #include "core/events/EventQueue.h"
 #include "modules/EventTargetModulesNames.h"
+#include "modules/payments/PaymentAddress.h"
 #include "modules/payments/PaymentItem.h"
 #include "modules/payments/PaymentRequestUpdateEvent.h"
 #include "modules/payments/PaymentResponse.h"
 #include "modules/payments/PaymentsValidators.h"
-#include "modules/payments/ShippingAddress.h"
 #include "modules/payments/ShippingOption.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/wtf_array.h"
 #include "platform/mojo/MojoHelper.h"
 #include "public/platform/ServiceRegistry.h"
 #include <utility>
 
 namespace mojo {
 
 using blink::mojom::blink::CurrencyAmount;
@@ skipping 322 matching lines @@
 void PaymentRequest::contextDestroyed()
 {
     clearResolversAndCloseMojoConnection();
 }
 
 bool PaymentRequest::hasPendingActivity() const
 {
     return m_showResolver || m_completeResolver;
 }
 
-void PaymentRequest::OnShippingAddressChange(mojom::blink::ShippingAddressPtr address)
+void PaymentRequest::OnShippingAddressChange(mojom::blink::PaymentAddressPtr address)
 {
     DCHECK(m_showResolver);
     DCHECK(!m_completeResolver);
 
     String errorMessage;
     if (!PaymentsValidators::isValidShippingAddress(address, &errorMessage)) {
         m_showResolver->reject(DOMException::create(SyntaxError, errorMessage));
         clearResolversAndCloseMojoConnection();
         return;
     }
 
-    m_shippingAddress = new ShippingAddress(std::move(address));
+    m_shippingAddress = new PaymentAddress(std::move(address));
     PaymentRequestUpdateEvent* event = PaymentRequestUpdateEvent::create(EventTypeNames::shippingaddresschange);
     event->setTarget(this);
     event->setPaymentDetailsUpdater(this);
     bool success = getExecutionContext()->getEventQueue()->enqueueEvent(event);
     DCHECK(success);
     ALLOW_UNUSED_LOCAL(success);
 }
 
 void PaymentRequest::OnShippingOptionChange(const String& shippingOptionId)
 {
@@ skipping 14 matching lines @@
     DCHECK(!m_completeResolver);
 
     if (response->shipping_address) {
         String errorMessage;
         if (!PaymentsValidators::isValidShippingAddress(response->shipping_address, &errorMessage)) {
             m_showResolver->reject(DOMException::create(SyntaxError, errorMessage));
             clearResolversAndCloseMojoConnection();
             return;
         }
 
-        m_shippingAddress = new ShippingAddress(std::move(response->shipping_address));
+        m_shippingAddress = new PaymentAddress(std::move(response->shipping_address));
         m_shippingOption = response->shipping_option_id;
     }
 
     m_showResolver->resolve(new PaymentResponse(std::move(response), this));
 
     // Do not close the mojo connection here. The merchant website should call
     // PaymentResponse::complete(boolean), which will be forwarded over the mojo
     // connection to display a success or failure message to the user.
     m_showResolver.clear();
 }
@@ skipping 17 matching lines @@
 void PaymentRequest::clearResolversAndCloseMojoConnection()
 {
     m_completeResolver.clear();
     m_showResolver.clear();
     if (m_clientBinding.is_bound())
         m_clientBinding.Close();
     m_paymentProvider.reset();
 }
 
 } // namespace blink