Rename remaining types so that all begin Payment*

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

Index: third_party/WebKit/Source/modules/payments/PaymentRequestTest.cpp
diff --git a/third_party/WebKit/Source/modules/payments/PaymentRequestTest.cpp b/third_party/WebKit/Source/modules/payments/PaymentRequestTest.cpp
index 1f0d20c65d93438c17c281f8d13176dc4457eed3..7f883a7c465dfc3a85e28cca61dc9b12552314c3 100644
--- a/third_party/WebKit/Source/modules/payments/PaymentRequestTest.cpp
+++ b/third_party/WebKit/Source/modules/payments/PaymentRequestTest.cpp
@@ -10,11 +10,11 @@
 #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"
@@ -96,7 +96,7 @@ 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);
 
@@ -109,7 +109,7 @@ 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());
 
@@ -120,7 +120,7 @@ TEST_F(PaymentRequestTest, DontSelectSingleAvailableShippingOptionWhenShippingNo
 {
     PaymentDetails details;
     details.setTotal(buildPaymentItemForTest());
-    details.setShippingOptions(HeapVector<ShippingOption>(1, buildShippingOptionForTest()));
+    details.setShippingOptions(HeapVector<PaymentShippingOption>(1, buildShippingOptionForTest()));
     PaymentOptions options;
     options.setRequestShipping(false);
 
@@ -133,7 +133,7 @@ TEST_F(PaymentRequestTest, DontSelectSingleUnselectedShippingOptionWhenShippingR
 {
     PaymentDetails details;
     details.setTotal(buildPaymentItemForTest());
-    details.setShippingOptions(HeapVector<ShippingOption>(1, buildShippingOptionForTest()));
+    details.setShippingOptions(HeapVector<PaymentShippingOption>(1, buildShippingOptionForTest()));
     PaymentOptions options;
     options.setRequestShipping(true);
 
@@ -146,7 +146,7 @@ TEST_F(PaymentRequestTest, SelectSingleSelectedShippingOptionWhenShippingRequest
 {
     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;
@@ -161,7 +161,7 @@ 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");
@@ -178,7 +178,7 @@ 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");