Download web payment manifests.

chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
index 58d95b38c5a4961275e5f471aff7aaa9393b32c1..81dfcbfaff1d1835a2293b113991bc178b54ad8b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
@@ -397,8 +397,8 @@ public class PaymentRequestImpl
 
         if (!parseAndValidateDetailsOrDisconnectFromClient(details)) return;
 
-        PaymentAppFactory.getInstance().create(
-                mWebContents, Collections.unmodifiableSet(mMethodData.keySet()), this);
+        PaymentAppFactory.getInstance().create(mWebContents,
+                Collections.unmodifiableSet(mMethodData.keySet()), this /* callback */);
 
         mRequestShipping = options != null && options.requestShipping;
         mRequestPayerName = options != null && options.requestPayerName;
@@ -625,6 +625,15 @@ public class PaymentRequestImpl
             }
         }
 
+        if (queryApps.isEmpty()) {
+            CanMakePaymentQuery query = sCanMakePaymentQueries.get(mSchemelessOriginForPaymentApp);
+            if (query != null && query.matchesPaymentMethods(mMethodData)) {
+                query.notifyObserversOfResponse(false);

[gogerald1, 2017/03/03 19:40:27]

How about add this logic to disconnectFromClientWithDebugMessage so as to work
for other situations?

[please use gerrit instead, 2017/03/09 18:05:32]

Closing the connection to the current instance of PaymentRequest should not
necessarily trigger rejection of all .canMakePayment() queries in flight,
because disconnectFromClientWithDebugMessage() can be called when user closes
the UI, for example. However, other instances of PaymentRequest could still be
around with pending .canMakePayment() queries that should be answered
accurately, rather than with "false".

+            }
+        }
+
+        if (disconnectIfNoPaymentMethodsSupported()) return;
+
         // Query instruments after mMerchantSupportsAutofillPaymentInstruments has been initialized,
         // so a fast response from a non-autofill payment app at the front of the app list does not
         // cause NOT_SUPPORTED payment rejection.
@@ -1376,7 +1385,9 @@ public class PaymentRequestImpl
         }
 
         CanMakePaymentQuery query = sCanMakePaymentQueries.get(mSchemelessOriginForPaymentApp);
-        if (query != null) query.notifyObserversOfResponse(mCanMakePayment);
+        if (query != null && query.matchesPaymentMethods(mMethodData)) {

[gogerald1, 2017/03/03 19:40:27]

We should no need matchesPaymentMethods if notifyObserversOfResponse is called
to clear observers at the end of PR. Assume the merchant website has no way to
change payment methods in current PR.

[please use gerrit instead, 2017/03/09 18:05:32]

This is important for the merchant that has created multiple PaymentRequest
objects with different payment methods and called .canMakePayment() on all of
them at the same time. Only one of them should be answered with "true" or
"false". The rest should be answered with QuotaExceeedError. All of the requests
are shared among instances of PaymentRequest in the static variable
sCanMakePaymentQueries. That's why we need matchesPaymentMethods() here. Sorry
about the confusion. I should avoid static variables like the plague, but in
this case not sure how to improve the code readability and reliability without
sacrificing functionality.

+            query.notifyObserversOfResponse(mCanMakePayment);
+        }
 
         // The list of payment instruments is ready to display.
         List<PaymentInstrument> sortedInstruments = new ArrayList<>();
@@ -1402,15 +1413,14 @@ public class PaymentRequestImpl
      * @return True if no payment methods are supported
      */
     private boolean disconnectIfNoPaymentMethodsSupported() {
-        if (!isFinishedQueryingPaymentApps()) return false;
+        if (!isFinishedQueryingPaymentApps() || !mIsCurrentPaymentRequestShowing) return false;

[gogerald1, 2017/03/03 19:40:27]

This looks has been broken here
https://cs.chromium.org/chromium/src/chrome/android/java/src/org/chromium/chr....

I can try to fix it in another CL,

[please use gerrit instead, 2017/03/09 18:05:32]

I don't follow. Please explain more.

 
         boolean foundPaymentMethods = mPaymentMethodsSection != null
                 && !mPaymentMethodsSection.isEmpty();
         boolean userCanAddCreditCard = mMerchantSupportsAutofillPaymentInstruments
                 && !ChromeFeatureList.isEnabled(ChromeFeatureList.NO_CREDIT_CARD_ABORT);
 
-        if (!mArePaymentMethodsSupported || (mIsCurrentPaymentRequestShowing && !foundPaymentMethods
-                                                    && !userCanAddCreditCard)) {
+        if (!mArePaymentMethodsSupported || (!foundPaymentMethods && !userCanAddCreditCard)) {
             // All payment apps have responded, but none of them have instruments. It's possible to
             // add credit cards, but the merchant does not support them either. The payment request
             // must be rejected.