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

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

 // 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.
 
 #include "modules/payments/PaymentRequest.h"
 
 #include <stddef.h>
 #include <utility>
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
@@ skipping 114 matching lines @@
 
 // If the website does not call complete() 60 seconds after show() has been
 // resolved, then behave as if the website called complete("fail").
 static const int completeTimeoutSeconds = 60;
 
 // Validates ShippingOption or PaymentItem, which happen to have identical
 // fields, except for "id", which is present only in ShippingOption.
 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;
   }
 
   if (!item.amount().hasValue()) {
     exceptionState.throwTypeError("Currency value required");
     return;
   }
 
   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);
     return;
   }
 }
 
 void validateAndConvertDisplayItems(const HeapVector<PaymentItem>& input,
                                     Vector<PaymentItemPtr>& output,
                                     ExceptionState& exceptionState) {
@@ skipping 899 matching lines @@
   m_completeResolver.clear();
   m_showResolver.clear();
   m_abortResolver.clear();
   m_canMakePaymentResolver.clear();
   if (m_clientBinding.is_bound())
     m_clientBinding.Close();
   m_paymentProvider.reset();
 }
 
 }  // namespace blink