[Merge M-56] Add canMakeActivePayment() method to web payments.

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

 // 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.
 
 package org.chromium.chrome.browser.payments;
 
 import android.app.Activity;
 
 import org.chromium.chrome.browser.ChromeFeatureList;
-import org.chromium.chrome.browser.payments.PaymentRequestImpl.PaymentRequestDismissObserver;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.mojo.system.MojoException;
+import org.chromium.payments.mojom.ActivePaymentQueryResult;
 import org.chromium.payments.mojom.PaymentDetails;
 import org.chromium.payments.mojom.PaymentErrorReason;
 import org.chromium.payments.mojom.PaymentMethodData;
 import org.chromium.payments.mojom.PaymentOptions;
 import org.chromium.payments.mojom.PaymentRequest;
 import org.chromium.payments.mojom.PaymentRequestClient;
 import org.chromium.services.service_manager.InterfaceFactory;
 import org.chromium.ui.base.WindowAndroid;
 
 /**
  * Creates instances of PaymentRequest.
  */
-public class PaymentRequestFactory
-        implements InterfaceFactory<PaymentRequest>, PaymentRequestDismissObserver {
+public class PaymentRequestFactory implements InterfaceFactory<PaymentRequest> {
     private final WebContents mWebContents;
-    private boolean mIsPaymentRequestRunning;
 
     /**
      * An implementation of PaymentRequest that immediately rejects all connections.
      * Necessary because Mojo does not handle null returned from createImpl().
      */
     private static final class InvalidPaymentRequest implements PaymentRequest {
         private PaymentRequestClient mClient;
 
         @Override
         public void init(PaymentRequestClient client, PaymentMethodData[] methodData,
@@ skipping 12 matching lines @@
         @Override
         public void updateWith(PaymentDetails details) {}
 
         @Override
         public void abort() {}
 
         @Override
         public void complete(int result) {}
 
         @Override
+        public void canMakeActivePayment() {
+            if (mClient != null) {
+                mClient.onCanMakeActivePayment(ActivePaymentQueryResult.CANNOT_MAKE_ACTIVE_PAYMENT);
+            }
+        }
+
+        @Override
         public void close() {}
 
         @Override
         public void onConnectionError(MojoException e) {}
     }
 
     /**
      * Builds a factory for PaymentRequest.
      *
      * @param webContents The web contents that may invoke the PaymentRequest API.
@@ skipping 12 matching lines @@
 
         ContentViewCore contentViewCore = ContentViewCore.fromWebContents(mWebContents);
         if (contentViewCore == null) return new InvalidPaymentRequest();
 
         WindowAndroid window = contentViewCore.getWindowAndroid();
         if (window == null) return new InvalidPaymentRequest();
 
         Activity context = window.getActivity().get();
         if (context == null) return new InvalidPaymentRequest();
 
-        if (mIsPaymentRequestRunning) return new InvalidPaymentRequest();
-        mIsPaymentRequestRunning = true;
-
-        return new PaymentRequestImpl(context, mWebContents, this);
-    }
-
-    @Override
-    public void onPaymentRequestDismissed() {
-        mIsPaymentRequestRunning = false;
+        return new PaymentRequestImpl(context, mWebContents);
     }
 }