Rename remaining types so that all begin Payment*

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 "bindings/modules/v8/V8PaymentResponse.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/testing/DummyPageHolder.h"
-#include "modules/payments/CurrencyAmount.h"
 #include "modules/payments/PaymentAddress.h"
+#include "modules/payments/PaymentCurrencyAmount.h"
 #include "modules/payments/PaymentItem.h"
+#include "modules/payments/PaymentShippingOption.h"
 #include "modules/payments/PaymentTestHelper.h"
-#include "modules/payments/ShippingOption.h"
 #include "platform/heap/HeapAllocator.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "wtf/OwnPtr.h"
 #include <utility>
 
 namespace blink {
 namespace {
 
 class PaymentRequestTest : public testing::Test {
@@ skipping 61 matching lines @@
 
     PaymentRequest* request = PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), details, options, getExceptionState());
 
     EXPECT_TRUE(request->shippingOption().isNull());
 }
 
 TEST_F(PaymentRequestTest, NullShippingOptionWhenMultipleOptionsAvailable)
 {
     PaymentDetails details;
     details.setTotal(buildPaymentItemForTest());
-    details.setShippingOptions(HeapVector<ShippingOption>(2, buildShippingOptionForTest()));
+    details.setShippingOptions(HeapVector<PaymentShippingOption>(2, buildShippingOptionForTest()));
     PaymentOptions options;
     options.setRequestShipping(true);
 
     PaymentRequest* request = PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), details, options, getExceptionState());
 
     EXPECT_TRUE(request->shippingOption().isNull());
 }
 
 TEST_F(PaymentRequestTest, DontSelectSingleAvailableShippingOptionByDefault)
 {
     PaymentDetails details;
     details.setTotal(buildPaymentItemForTest());
-    details.setShippingOptions(HeapVector<ShippingOption>(1, buildShippingOptionForTest(PaymentTestDataId, PaymentTestOverwriteValue, "standard")));
+    details.setShippingOptions(HeapVector<PaymentShippingOption>(1, buildShippingOptionForTest(PaymentTestDataId, PaymentTestOverwriteValue, "standard")));
 
     PaymentRequest* request = PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), details, getExceptionState());
 
     EXPECT_TRUE(request->shippingOption().isNull());
 }
 
 TEST_F(PaymentRequestTest, DontSelectSingleAvailableShippingOptionWhenShippingNotRequested)
 {
     PaymentDetails details;
     details.setTotal(buildPaymentItemForTest());
-    details.setShippingOptions(HeapVector<ShippingOption>(1, buildShippingOptionForTest()));
+    details.setShippingOptions(HeapVector<PaymentShippingOption>(1, buildShippingOptionForTest()));
     PaymentOptions options;
     options.setRequestShipping(false);
 
     PaymentRequest* request = PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), details, options, getExceptionState());
 
     EXPECT_TRUE(request->shippingOption().isNull());
 }
 
 TEST_F(PaymentRequestTest, DontSelectSingleUnselectedShippingOptionWhenShippingRequested)
 {
     PaymentDetails details;
     details.setTotal(buildPaymentItemForTest());
-    details.setShippingOptions(HeapVector<ShippingOption>(1, buildShippingOptionForTest()));
+    details.setShippingOptions(HeapVector<PaymentShippingOption>(1, buildShippingOptionForTest()));
     PaymentOptions options;
     options.setRequestShipping(true);
 
     PaymentRequest* request = PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), details, options, getExceptionState());
 
     EXPECT_TRUE(request->shippingOption().isNull());
 }
 
 TEST_F(PaymentRequestTest, SelectSingleSelectedShippingOptionWhenShippingRequested)
 {
     PaymentDetails details;
     details.setTotal(buildPaymentItemForTest());
-    HeapVector<ShippingOption> shippingOptions(1, buildShippingOptionForTest(PaymentTestDataId, PaymentTestOverwriteValue, "standard"));
+    HeapVector<PaymentShippingOption> shippingOptions(1, buildShippingOptionForTest(PaymentTestDataId, PaymentTestOverwriteValue, "standard"));
     shippingOptions[0].setSelected(true);
     details.setShippingOptions(shippingOptions);
     PaymentOptions options;
     options.setRequestShipping(true);
 
     PaymentRequest* request = PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), details, options, getExceptionState());
 
     EXPECT_EQ("standard", request->shippingOption());
 }
 
 TEST_F(PaymentRequestTest, SelectOnlySelectedShippingOptionWhenShippingRequested)
 {
     PaymentDetails details;
     details.setTotal(buildPaymentItemForTest());
-    HeapVector<ShippingOption> shippingOptions(2);
+    HeapVector<PaymentShippingOption> shippingOptions(2);
     shippingOptions[0] = buildShippingOptionForTest(PaymentTestDataId, PaymentTestOverwriteValue, "standard");
     shippingOptions[0].setSelected(true);
     shippingOptions[1] = buildShippingOptionForTest(PaymentTestDataId, PaymentTestOverwriteValue, "express");
     details.setShippingOptions(shippingOptions);
     PaymentOptions options;
     options.setRequestShipping(true);
 
     PaymentRequest* request = PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), details, options, getExceptionState());
 
     EXPECT_EQ("standard", request->shippingOption());
 }
 
 TEST_F(PaymentRequestTest, SelectLastSelectedShippingOptionWhenShippingRequested)
 {
     PaymentDetails details;
     details.setTotal(buildPaymentItemForTest());
-    HeapVector<ShippingOption> shippingOptions(2);
+    HeapVector<PaymentShippingOption> shippingOptions(2);
     shippingOptions[0] = buildShippingOptionForTest(PaymentTestDataId, PaymentTestOverwriteValue, "standard");
     shippingOptions[0].setSelected(true);
     shippingOptions[1] = buildShippingOptionForTest(PaymentTestDataId, PaymentTestOverwriteValue, "express");
     shippingOptions[1].setSelected(true);
     details.setShippingOptions(shippingOptions);
     PaymentOptions options;
     options.setRequestShipping(true);
 
     PaymentRequest* request = PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), details, options, getExceptionState());
 
@@ skipping 361 matching lines @@
         "{\"id\": \"fast\", \"label\": \"Fast\", \"amount\": {\"currency\": \"USD\", \"value\": \"50.00\"}, \"selected\": true}]}";
 
     request->onUpdatePaymentDetails(ScriptValue::from(getScriptState(), fromJSONString(getScriptState(), detail, getExceptionState())));
     EXPECT_FALSE(getExceptionState().hadException());
 
     EXPECT_EQ("fast", request->shippingOption());
 }
 
 } // namespace
 } // namespace blink