Parameterize OnError method.

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 "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/JSONValuesForV8.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
@@ skipping 18 matching lines @@
 #include <utility>
 
 namespace mojo {
 
 using blink::mojom::blink::PaymentCurrencyAmount;
 using blink::mojom::blink::PaymentCurrencyAmountPtr;
 using blink::mojom::blink::PaymentDetails;
 using blink::mojom::blink::PaymentDetailsModifier;
 using blink::mojom::blink::PaymentDetailsModifierPtr;
 using blink::mojom::blink::PaymentDetailsPtr;
+using blink::mojom::blink::PaymentErrorReason;
 using blink::mojom::blink::PaymentItem;
 using blink::mojom::blink::PaymentItemPtr;
 using blink::mojom::blink::PaymentMethodData;
 using blink::mojom::blink::PaymentMethodDataPtr;
 using blink::mojom::blink::PaymentOptions;
 using blink::mojom::blink::PaymentOptionsPtr;
 using blink::mojom::blink::PaymentShippingOption;
 using blink::mojom::blink::PaymentShippingOptionPtr;
 
 template <>
@@ skipping 316 matching lines @@
 ScriptPromise PaymentRequest::show(ScriptState* scriptState)
 {
     if (m_showResolver)
         return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(InvalidStateError, "Already called show() once"));
 
     if (!scriptState->domWindow() || !scriptState->domWindow()->frame())
         return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(InvalidStateError, "Cannot show the payment request"));
 
     DCHECK(!m_paymentProvider.is_bound());
     scriptState->domWindow()->frame()->serviceRegistry()->connectToRemoteService(mojo::GetProxy(&m_paymentProvider));
-    m_paymentProvider.set_connection_error_handler(convertToBaseCallback(WTF::bind(&PaymentRequest::OnError, wrapWeakPersistent(this))));
+    m_paymentProvider.set_connection_error_handler(convertToBaseCallback(WTF::bind(&PaymentRequest::OnError, wrapWeakPersistent(this), mojom::blink::PaymentErrorReason::UNKNOWN)));
     m_paymentProvider->SetClient(m_clientBinding.CreateInterfacePtrAndBind());
     m_paymentProvider->Show(mojo::WTFArray<mojom::blink::PaymentMethodDataPtr>::From(m_methodData), mojom::blink::PaymentDetails::From(m_details), mojom::blink::PaymentOptions::From(m_options));
 
     m_showResolver = ScriptPromiseResolver::create(scriptState);
     return m_showResolver->promise();
 }
 
 ScriptPromise PaymentRequest::abort(ScriptState* scriptState)
 {
     if (m_abortResolver)
@@ skipping 193 matching lines @@
     }
 
     m_showResolver->resolve(new PaymentResponse(std::move(response), this));
 
     // Do not close the mojo connection here. The merchant website should call
     // PaymentResponse::complete(boolean), which will be forwarded over the mojo
     // connection to display a success or failure message to the user.
     m_showResolver.clear();
 }
 
-void PaymentRequest::OnError()
+void PaymentRequest::OnError(mojo::PaymentErrorReason error)
 {
+    ExceptionCode ec = SyntaxError;
+    String message = "The payment request is cancelled due to unknown reasons";

[please use gerrit instead, 2016/07/13 15:55:26]

No need to initialize this string. It will be overridden inside of the switch
statement.

[pals, 2016/07/14 08:37:38]

Done.

+    switch (error) {
+    case mojom::blink::PaymentErrorReason::USER_CANCEL:
+        message = "User cancelled the payment request";

[please use gerrit instead, 2016/07/13 15:55:26]

Change this to "Request cancelled" to fix the integration tests.

[pals, 2016/07/14 08:37:38]

Done.

+        break;
+    case mojom::blink::PaymentErrorReason::NOT_SUPPORTED:
+        ec = NotSupportedError;
+        message = "The payment method is not supported";
+        break;
+    case mojom::blink::PaymentErrorReason::UNKNOWN:
+        message = "The payment request is cancelled due to unknown reasons";

[please use gerrit instead, 2016/07/13 15:55:26]

Let's use a shorter message, like "Request failed".

[pals, 2016/07/14 08:37:38]

Done.

+        break;
+    }

[please use gerrit instead, 2016/07/13 15:55:26]

DCHECK(!message.IsEmpty());

[pals, 2016/07/14 08:37:38]

Done.

     if (m_completeResolver)
-        m_completeResolver->reject(DOMException::create(SyntaxError, "Request cancelled"));
+        m_completeResolver->reject(DOMException::create(ec, message));
     if (m_showResolver)
-        m_showResolver->reject(DOMException::create(SyntaxError, "Request cancelled"));
+        m_showResolver->reject(DOMException::create(ec, message));
     if (m_abortResolver)
-        m_abortResolver->reject(DOMException::create(SyntaxError, "Request cancelled"));
+        m_abortResolver->reject(DOMException::create(ec, message));
     clearResolversAndCloseMojoConnection();
 }
 
 void PaymentRequest::OnComplete()
 {
     DCHECK(m_completeResolver);
     m_completeResolver->resolve();
     clearResolversAndCloseMojoConnection();
 }
 
@@ skipping 17 matching lines @@
 {
     m_completeResolver.clear();
     m_showResolver.clear();
     m_abortResolver.clear();
     if (m_clientBinding.is_bound())
         m_clientBinding.Close();
     m_paymentProvider.reset();
 }
 
 } // namespace blink