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

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

Index: third_party/WebKit/Source/modules/payments/PaymentRequest.cpp
diff --git a/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp b/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp
index 506ec9de7d8df9023f17358904074d8e7de4b744..5ec19d634490e4d46772e96eeb062119589b8055 100644
--- a/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp
+++ b/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp
@@ -132,16 +132,22 @@ static const int completeTimeoutSeconds = 60;
 template <typename T>
 void validateShippingOptionOrPaymentItem(const T& item,
                                          ExceptionState& exceptionState) {
+  /* DO NOT SUBMIT - merge conflict marker.
+   * Please spell |hasLabel| and |label| below. */
   if (!item.hasLabel() || item.label().isEmpty()) {
     exceptionState.throwTypeError("Item label required");
     return;
   }
 
+  /* DO NOT SUBMIT - merge conflict marker.
+   * Please spell |hasAmount| below. */
   if (!item.hasAmount()) {
     exceptionState.throwTypeError("Currency amount required");
     return;
   }
 
+  /* DO NOT SUBMIT - merge conflict marker.
+   * Please spell |amount| below. */
   if (!item.amount().hasCurrency()) {
     exceptionState.throwTypeError("Currency code required");
     return;
@@ -154,12 +160,16 @@ void validateShippingOptionOrPaymentItem(const T& item,
 
   String errorMessage;
   if (!PaymentsValidators::isValidCurrencyCodeFormat(
+          /* DO NOT SUBMIT - merge conflict marker.
+           * Please spell |amount| in the *2* places on the line below. */
           item.amount().currency(), item.amount().currencySystem(),
           &errorMessage)) {
     exceptionState.throwTypeError(errorMessage);
     return;
   }
 
+  /* DO NOT SUBMIT - merge conflict marker.
+   * Please spell |amount| below. */
   if (!PaymentsValidators::isValidAmountFormat(item.amount().value(),
                                                &errorMessage)) {
     exceptionState.throwTypeError(errorMessage);