Rename remaining types so that all begin Payment*

third_party/WebKit/Source/modules/payments/PaymentTestHelper.h

 // 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.
 
 #ifndef PaymentTestHelper_h
 #define PaymentTestHelper_h
 
 #include "modules/payments/PaymentDetails.h"
 #include "modules/payments/PaymentItem.h"
 #include "modules/payments/PaymentMethodData.h"
-#include "modules/payments/ShippingOption.h"
+#include "modules/payments/PaymentShippingOption.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 enum PaymentTestDetailToChange {
     PaymentTestDetailNone,
     PaymentTestDetailTotal,
     PaymentTestDetailItem,
     PaymentTestDetailShippingOption
 };
 
 enum PaymentTestDataToChange {
     PaymentTestDataNone,
     PaymentTestDataId,
     PaymentTestDataLabel,
     PaymentTestDataAmount,
     PaymentTestDataCurrencyCode,
     PaymentTestDataValue,
 };
 
 enum PaymentTestModificationType {
     PaymentTestOverwriteValue,
     PaymentTestRemoveKey
 };
 
 PaymentItem buildPaymentItemForTest(PaymentTestDataToChange = PaymentTestDataNone, PaymentTestModificationType = PaymentTestOverwriteValue, const String& valueToUse = String());
 
-ShippingOption buildShippingOptionForTest(PaymentTestDataToChange = PaymentTestDataNone, PaymentTestModificationType = PaymentTestOverwriteValue, const String& valueToUse = String());
+PaymentShippingOption buildShippingOptionForTest(PaymentTestDataToChange = PaymentTestDataNone, PaymentTestModificationType = PaymentTestOverwriteValue, const String& valueToUse = String());
 
 PaymentDetails buildPaymentDetailsForTest(PaymentTestDetailToChange = PaymentTestDetailNone, PaymentTestDataToChange = PaymentTestDataNone, PaymentTestModificationType = PaymentTestOverwriteValue, const String& valueToUse = String());
 
 HeapVector<PaymentMethodData> buildPaymentMethodDataForTest();
 
 } // namespace blink
 
 #endif // PaymentTestHelper_h