Revert of PaymentRequest: Introduce PaymentDetailsInit and PaymentDetailsUpdate.

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

Index: third_party/WebKit/Source/modules/payments/PaymentTestHelper.cpp
diff --git a/third_party/WebKit/Source/modules/payments/PaymentTestHelper.cpp b/third_party/WebKit/Source/modules/payments/PaymentTestHelper.cpp
index 5f543fa5c588df433d7450056bc2f826dc001ed6..d4e326b88afb2b7e3883cc540c1dd7b8b77e1bda 100644
--- a/third_party/WebKit/Source/modules/payments/PaymentTestHelper.cpp
+++ b/third_party/WebKit/Source/modules/payments/PaymentTestHelper.cpp
@@ -55,40 +55,6 @@
   }
 }
 
-void buildPaymentDetailsBase(PaymentTestDetailToChange detail,
-                             PaymentTestDataToChange data,
-                             PaymentTestModificationType modificationType,
-                             const String& valueToUse,
-                             PaymentDetailsBase* details) {
-  PaymentItem item;
-  if (detail == PaymentTestDetailItem)
-    item = buildPaymentItemForTest(data, modificationType, valueToUse);
-  else
-    item = buildPaymentItemForTest();
-
-  PaymentShippingOption shippingOption;
-  if (detail == PaymentTestDetailShippingOption) {
-    shippingOption =
-        buildShippingOptionForTest(data, modificationType, valueToUse);
-  } else {
-    shippingOption = buildShippingOptionForTest();
-  }
-
-  PaymentDetailsModifier modifier;
-  if (detail == PaymentTestDetailModifierTotal ||
-      detail == PaymentTestDetailModifierItem) {
-    modifier = buildPaymentDetailsModifierForTest(detail, data,
-                                                  modificationType, valueToUse);
-  } else {
-    modifier = buildPaymentDetailsModifierForTest();
-  }
-
-  details->setDisplayItems(HeapVector<PaymentItem>(1, item));
-  details->setShippingOptions(
-      HeapVector<PaymentShippingOption>(1, shippingOption));
-  details->setModifiers(HeapVector<PaymentDetailsModifier>(1, modifier));
-}
-
 }  // namespace
 
 PaymentItem buildPaymentItemForTest(
@@ -140,50 +106,54 @@
   return modifier;
 }
 
-PaymentDetailsInit buildPaymentDetailsInitForTest(
+PaymentDetails buildPaymentDetailsForTest(
     PaymentTestDetailToChange detail,
     PaymentTestDataToChange data,
     PaymentTestModificationType modificationType,
     const String& valueToUse) {
-  PaymentDetailsInit details;
-  buildPaymentDetailsBase(detail, data, modificationType, valueToUse, &details);
-
-  if (detail == PaymentTestDetailTotal) {
-    details.setTotal(
-        buildPaymentItemForTest(data, modificationType, valueToUse));
-  } else {
-    details.setTotal(buildPaymentItemForTest());
-  }
-
-  return details;
-}
-
-PaymentDetailsUpdate buildPaymentDetailsUpdateForTest(
-    PaymentTestDetailToChange detail,
-    PaymentTestDataToChange data,
-    PaymentTestModificationType modificationType,
-    const String& valueToUse) {
-  PaymentDetailsUpdate details;
-  buildPaymentDetailsBase(detail, data, modificationType, valueToUse, &details);
-
-  if (detail == PaymentTestDetailTotal) {
-    details.setTotal(
-        buildPaymentItemForTest(data, modificationType, valueToUse));
-  } else {
-    details.setTotal(buildPaymentItemForTest());
-  }
+  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();
+
+  PaymentShippingOption shippingOption;
+  if (detail == PaymentTestDetailShippingOption)
+    shippingOption =
+        buildShippingOptionForTest(data, modificationType, valueToUse);
+  else
+    shippingOption = buildShippingOptionForTest();
+
+  PaymentDetailsModifier modifier;
+  if (detail == PaymentTestDetailModifierTotal ||
+      detail == PaymentTestDetailModifierItem)
+    modifier = buildPaymentDetailsModifierForTest(detail, data,
+                                                  modificationType, valueToUse);
+  else
+    modifier = buildPaymentDetailsModifierForTest();
+
+  PaymentDetails result;
+  result.setTotal(total);
+  result.setDisplayItems(HeapVector<PaymentItem>(1, item));
+  result.setShippingOptions(
+      HeapVector<PaymentShippingOption>(1, shippingOption));
+  result.setModifiers(HeapVector<PaymentDetailsModifier>(1, modifier));
 
   if (detail == PaymentTestDetailError)
-    details.setError(valueToUse);
-
-  return details;
-}
-
-PaymentDetailsUpdate buildPaymentDetailsErrorMsgForTest(
-    const String& valueToUse) {
-  return buildPaymentDetailsUpdateForTest(
-      PaymentTestDetailError, PaymentTestDataNone, PaymentTestOverwriteValue,
-      valueToUse);
+    result.setError(valueToUse);
+
+  return result;
+}
+
+PaymentDetails buildPaymentDetailsErrorMsgForTest(const String& valueToUse) {
+  return buildPaymentDetailsForTest(PaymentTestDetailError, PaymentTestDataNone,
+                                    PaymentTestOverwriteValue, valueToUse);
 }
 
 HeapVector<PaymentMethodData> buildPaymentMethodDataForTest() {