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 5f543fa5c588df433d7450056bc2f826dc001ed6..b31e3986777526a50846d0619a5d9e9a44e90142 100644
--- a/third_party/WebKit/Source/modules/payments/PaymentTestHelper.cpp
+++ b/third_party/WebKit/Source/modules/payments/PaymentTestHelper.cpp
@@ -45,12 +45,18 @@ void setValues(PaymentItemOrPaymentShippingOption& original,
   }
 
   if (data != PaymentTestDataAmount || modificationType != PaymentTestRemoveKey)
+    /* DO NOT SUBMIT - merge conflict marker.
+     * Please spell |setAmount|, not |SetAmount| below. */
     original.setAmount(itemAmount);
 
   if (data == PaymentTestDataLabel) {
     if (modificationType == PaymentTestOverwriteValue)
+      /* DO NOT SUBMIT - merge conflict marker.
+       * Please spell |setLabel|, not |SetLabel| below. */
       original.setLabel(valueToUse);
   } else {
+    /* DO NOT SUBMIT - merge conflict marker.
+     * Please spell |setLabel|, not |SetLabel| below. */
     original.setLabel("Label");
   }
 }