Rename remaining types so that all begin Payment*

third_party/WebKit/Source/modules/payments/PaymentTestHelper.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/PaymentTestHelper.h"
 
-#include "modules/payments/CurrencyAmount.h"
+#include "modules/payments/PaymentCurrencyAmount.h"
 #include "platform/heap/HeapAllocator.h"
 
 namespace blink {
 namespace {
 
-// PaymentItem and ShippingOption have identical structure
-// except for the "id" field, which is present only in ShippingOption.
-template <typename PaymentItemOrShippingOption>
-void setValues(PaymentItemOrShippingOption& original, PaymentTestDataToChange data, PaymentTestModificationType modificationType, const String& valueToUse)
+// PaymentItem and PaymentShippingOption have identical structure
+// except for the "id" field, which is present only in PaymentShippingOption.
+template <typename PaymentItemOrPaymentShippingOption>
+void setValues(PaymentItemOrPaymentShippingOption& original, PaymentTestDataToChange data, PaymentTestModificationType modificationType, const String& valueToUse)
 {
-    CurrencyAmount itemAmount;
+    PaymentCurrencyAmount itemAmount;
     if (data == PaymentTestDataCurrencyCode) {
         if (modificationType == PaymentTestOverwriteValue)
             itemAmount.setCurrency(valueToUse);
     } else {
         itemAmount.setCurrency("USD");
     }
     if (data == PaymentTestDataValue) {
         if (modificationType == PaymentTestOverwriteValue)
             itemAmount.setValue(valueToUse);
     } else {
@@ skipping 14 matching lines @@
 } // namespace
 
 PaymentItem buildPaymentItemForTest(PaymentTestDataToChange data, PaymentTestModificationType modificationType, const String& valueToUse)
 {
     DCHECK_NE(data, PaymentTestDataId);
     PaymentItem item;
     setValues(item, data, modificationType, valueToUse);
     return item;
 }
 
-ShippingOption buildShippingOptionForTest(PaymentTestDataToChange data, PaymentTestModificationType modificationType, const String& valueToUse)
+PaymentShippingOption buildShippingOptionForTest(PaymentTestDataToChange data, PaymentTestModificationType modificationType, const String& valueToUse)
 {
-    ShippingOption shippingOption;
+    PaymentShippingOption shippingOption;
     if (data == PaymentTestDataId) {
         if (modificationType == PaymentTestOverwriteValue)
             shippingOption.setId(valueToUse);
     } else {
         shippingOption.setId("id");
     }
     setValues(shippingOption, data, modificationType, valueToUse);
     return shippingOption;
 }
 
 PaymentDetails buildPaymentDetailsForTest(PaymentTestDetailToChange detail, PaymentTestDataToChange data, PaymentTestModificationType modificationType, const String& valueToUse)
 {
     PaymentItem total;
     if (detail == PaymentTestDetailTotal)
         total = buildPaymentItemForTest(data, modificationType, valueToUse);
     else
         total = buildPaymentItemForTest();
 
     PaymentItem item;
     if (detail == PaymentTestDetailItem)
         item = buildPaymentItemForTest(data, modificationType, valueToUse);
     else
         item = buildPaymentItemForTest();
 
-    ShippingOption shippingOption;
+    PaymentShippingOption shippingOption;
     if (detail == PaymentTestDetailShippingOption)
         shippingOption = buildShippingOptionForTest(data, modificationType, valueToUse);
     else
         shippingOption = buildShippingOptionForTest();
 
     PaymentDetails result;
     result.setTotal(total);
     result.setDisplayItems(HeapVector<PaymentItem>(1, item));
-    result.setShippingOptions(HeapVector<ShippingOption>(2, shippingOption));
+    result.setShippingOptions(HeapVector<PaymentShippingOption>(2, shippingOption));
 
     return result;
 }
 
 HeapVector<PaymentMethodData> buildPaymentMethodDataForTest()
 {
     HeapVector<PaymentMethodData> methodData(1, PaymentMethodData());
     methodData[0].setSupportedMethods(Vector<String>(1, "foo"));
     return methodData;
 }
 
 } // namespace blink