Parameterize OnError method.

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 386f630876a9c71a1349abdb661c91fee410b93f..d987f5c11836c6ea4268d63c9c4db51d46337774 100644
--- a/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp
+++ b/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp
@@ -36,6 +36,7 @@ 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;
@@ -372,7 +373,7 @@ ScriptPromise PaymentRequest::show(ScriptState* scriptState)
 
     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));
 
@@ -586,14 +587,31 @@ void PaymentRequest::OnPaymentResponse(mojom::blink::PaymentResponsePtr response
     m_showResolver.clear();
 }
 
-void PaymentRequest::OnError()
+void PaymentRequest::OnError(mojo::PaymentErrorReason error)
 {
+    ExceptionCode ec = SyntaxError;
+    String message;
+    switch (error) {
+    case mojom::blink::PaymentErrorReason::CANCEL:

[palmer, 2016/07/16 00:37:33]

|SyntaxError| doesn't seem to be the right |ExceptionCode| for CANCEL or
UNKNOWN. Are there other codes you can use for those?

[please use gerrit instead, 2016/07/16 01:26:59]

The spec is vague here, but I think the correct approach is to reject with a
string for CANCEL and UnknownError for UNKNOWN.

bool isError = false;
ExceptionCode ec;
String message;

switch (error) {
case mojom::blink::PaymentErrorReason::CANCEL:
    message = "Request cancelled";
    break;
case mojom::blink::PaymentErrorReason::NOT_SUPPORTED:
    isError = true;
    ec = NotSupportedError;
    message = "The payment method is not supported";
    break;
case mojom::blink::PaymentErrorReason::UNKNOWN:
    isError = true;
    ec = UnknownError;
    message = "Request failed";
    break;
}

DCHECK(!message.isEmpty());

if (m_completeResolver)
    m_completeResolver->reject(isError ? DOMException::create(ec, message) :
message);

if (m_showResolver)
    m_showResolver->reject(isError ? DOMException::create(ec, message) :
message);

if (m_abortResolver)
    m_abortResolver->reject(isError ? DOMException::create(ec, message) :
message);

clearResolversAndCloseMojoConnection();

[pals, 2016/07/18 04:00:38]

Compiler gives following error for the above code.
"../../third_party/WebKit/Source/modules/payments/PaymentRequest.cpp:615:44:
error: incompatible operand types ('blink::DOMException *' and 'WTF::String')
        m_completeResolver->reject(isError ? DOMException::create(ec, message) :
message);
" 

So, I changed the code accordingly. Please review once more.

+        message = "Request cancelled";
+        break;
+    case mojom::blink::PaymentErrorReason::NOT_SUPPORTED:
+        ec = NotSupportedError;
+        message = "The payment method is not supported";
+        break;
+    case mojom::blink::PaymentErrorReason::UNKNOWN:
+        message = "Request failed";
+        break;
+    }
+
+    DCHECK(!message.isEmpty());
+
     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();
 }