ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool.

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 d4e326b88afb2b7e3883cc540c1dd7b8b77e1bda..a9c50a74026aa2c157137c6d6fb4cf0745941c87 100644
--- a/third_party/WebKit/Source/modules/payments/PaymentTestHelper.cpp
+++ b/third_party/WebKit/Source/modules/payments/PaymentTestHelper.cpp
@@ -44,13 +44,19 @@ void setValues(PaymentItemOrPaymentShippingOption& original,
     itemAmount.setValue("9.99");
   }
 
-  if (data != PaymentTestDataAmount || modificationType != PaymentTestRemoveKey)
-    original.setAmount(itemAmount);
-
-  if (data == PaymentTestDataLabel) {
-    if (modificationType == PaymentTestOverwriteValue)
-      original.setLabel(valueToUse);
+  if (data != kPaymentTestDataAmount || modification_type != kPaymentTestRemoveKey)
+    /* DO NOT SUBMIT - merge conflict marker.
+     * Please spell |setAmount|, not |SetAmount| below. */
+    original.setAmount(item_amount);
+
+  if (data == kPaymentTestDataLabel) {
+    if (modification_type == kPaymentTestOverwriteValue)
+      /* DO NOT SUBMIT - merge conflict marker.
+       * Please spell |setLabel|, not |SetLabel| below. */
+      original.setLabel(value_to_use);
   } else {
+    /* DO NOT SUBMIT - merge conflict marker.
+     * Please spell |setLabel|, not |SetLabel| below. */
     original.setLabel("Label");
   }
 }