PaymentHandler: Replace GetAllManifests() with GetAllPaymentApps().

chrome/android/java/src/org/chromium/chrome/browser/payments/ServiceWorkerPaymentAppBridge.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.graphics.drawable.Drawable;
-
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.payments.mojom.PaymentDetailsModifier;
 import org.chromium.payments.mojom.PaymentItem;
 import org.chromium.payments.mojom.PaymentMethodData;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
 /**
  * Native bridge for interacting with service worker based payment apps.
  */
 // TODO(tommyt): crbug.com/669876. Remove these suppressions when we actually
 // start using all of the functionality in this class.
 @SuppressFBWarnings({"UWF_NULL_FIELD", "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD",
         "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UUF_UNUSED_PUBLIC_OR_PROTECTED_FIELD"})
 public class ServiceWorkerPaymentAppBridge implements PaymentAppFactory.PaymentAppFactoryAddition {
-    /**
-     * This class represents a payment app manifest as defined in the Payment
-     * App API specification.
-     *
-     * @see https://w3c.github.io/webpayments-payment-apps-api/#payment-app-manifest
-     */
-    public static class Manifest {
-        /**
-         * The registration ID of the service worker.
-         *
-         * This can be used to identify a service worker based payment app.
-         */
-        public long registrationId;
-        public String label;
-        public Drawable icon;
-        public List<Option> options = new ArrayList<>();
+    @Override
+    public void create(WebContents webContents, Set<String> methodNames,
+            PaymentAppFactory.PaymentAppCreatedCallback callback) {
+        nativeGetAllPaymentApps(webContents, callback);
     }
 
     /**
-     * This class represents a payment option as defined in the Payment App API
-     * specification.
-     *
-     * @see https://w3c.github.io/webpayments-payment-apps-api/#payment-app-options
-     */
-    public static class Option {
-        public String id;
-        public String label;
-        public Drawable icon;
-        public List<String> enabledMethods = new ArrayList<>();
-    }
-
-    @Override
-    public void create(WebContents webContents, Set<String> methodNames,
-            PaymentAppFactory.PaymentAppCreatedCallback callback) {
-        nativeGetAllAppManifests(webContents, callback);
-    }
-
-    /**
      * Invoke a payment app with a given option and matching method data.
      *
      * @param webContents    The web contents that invoked PaymentRequest.
      * @param registrationId The service worker registration ID of the Payment App.
      * @param optionId       The ID of the PaymentOption that was selected by the user.
      * @param methodData     The PaymentMethodData objects that are relevant for this payment
      *                       app.
      * @param total          The PaymentItem that represents the total cost of the payment.
      * @param modifiers      Payment method specific modifiers to the payment items and the total.
      * @param callback       Called after the payment app is finished running.
      */
     public static void invokePaymentApp(WebContents webContents, long registrationId,
             String optionId, String origin, String unusedIframeOrigin,
             Set<PaymentMethodData> methodData, PaymentItem total, List<PaymentItem> displayItems,
             Set<PaymentDetailsModifier> modifiers,
             PaymentInstrument.InstrumentDetailsCallback callback) {
         nativeInvokePaymentApp(webContents, registrationId, optionId, origin,
                 methodData.toArray(new PaymentMethodData[0]), total,
                 modifiers.toArray(new PaymentDetailsModifier[0]), callback);
     }
 
     @CalledByNative
-    private static Manifest createManifest(long registrationId, String label, String icon) {
-        Manifest manifest = new Manifest();
-        manifest.registrationId = registrationId;
-        manifest.label = label;
-        // TODO(tommyt): crbug.com/669876. Handle icons.
-        manifest.icon = null;
-        return manifest;
+    private static List<PaymentInstrument> createInstrumentList() {
+        return new ArrayList<PaymentInstrument>();
     }
 
     @CalledByNative
-    private static Option createAndAddOption(
-            Manifest manifest, String id, String label, String icon) {
-        Option option = new Option();
-        option.id = id;
-        option.label = label;
-        // TODO(tommyt): crbug.com/669876. Handle icons.
-        option.icon = null;
-        manifest.options.add(option);
-        return option;
+    private static void addInstrument(List<PaymentInstrument> instruments, WebContents webContents,
+            long swRegistrationId, String instrumentId, String label, String[] methodNames) {
+        instruments.add(new ServiceWorkerPaymentInstrument(webContents, swRegistrationId,
+                instrumentId, label, new HashSet<String>(Arrays.asList(methodNames))));

[please use gerrit instead, 2017/05/09 18:54:36]

Instead of creating an intermediate List and then throwing it away, please use a
"for (int i = 0..." loop over methodNames and add each method name to the set
directly.

[zino, 2017/05/10 18:28:39]

Done.

     }
 
     @CalledByNative
-    private static void addEnabledMethod(Option option, String enabledMethod) {
-        option.enabledMethods.add(enabledMethod);
-    }
-
-    @CalledByNative
     private static String[] getSupportedMethodsFromMethodData(PaymentMethodData data) {
         return data.supportedMethods;
     }
 
     @CalledByNative
     private static String getStringifiedDataFromMethodData(PaymentMethodData data) {
         return data.stringifiedData;
     }
 
     @CalledByNative
@@ skipping 15 matching lines @@
     private static String getCurrencyFromPaymentItem(PaymentItem item) {
         return item.amount.currency;
     }
 
     @CalledByNative
     private static String getValueFromPaymentItem(PaymentItem item) {
         return item.amount.value;
     }
 
     @CalledByNative
-    private static void onGotManifest(Manifest manifest, WebContents webContents, Object callback) {
+    private static void onPaymentAppCreated(
+            List<PaymentInstrument> instruments, WebContents webContents, Object callback) {
         assert callback instanceof PaymentAppFactory.PaymentAppCreatedCallback;
         ((PaymentAppFactory.PaymentAppCreatedCallback) callback)
-                .onPaymentAppCreated(new ServiceWorkerPaymentApp(webContents, manifest));
+                .onPaymentAppCreated(new ServiceWorkerPaymentApp(webContents, instruments));
     }
 
     @CalledByNative
-    private static void onGotAllManifests(Object callback) {
+    private static void onAllPaymentAppsCreated(Object callback) {
         assert callback instanceof PaymentAppFactory.PaymentAppCreatedCallback;
         ((PaymentAppFactory.PaymentAppCreatedCallback) callback).onAllPaymentAppsCreated();
     }
 
     @CalledByNative
     private static void onPaymentAppInvoked(
             Object callback, String methodName, String stringifiedDetails) {
         assert callback instanceof PaymentInstrument.InstrumentDetailsCallback;
         if (methodName == null) {
             ((PaymentInstrument.InstrumentDetailsCallback) callback).onInstrumentDetailsError();
         } else {
             ((PaymentInstrument.InstrumentDetailsCallback) callback)
                     .onInstrumentDetailsReady(methodName, stringifiedDetails);
         }
     }
 
     /*
      * TODO(tommyt): crbug.com/505554. Change the |callback| parameter below to
-     * be of type PaymentAppFactory.PaymentAppCreatedCallback, once this JNI bug
+     * be of type PaymentInstrument.InstrumentDetailsCallback, once this JNI bug
      * has been resolved.
      */
-    private static native void nativeGetAllAppManifests(WebContents webContents, Object callback);
+    private static native void nativeGetAllPaymentApps(WebContents webContents, Object callback);
 
     /*
      * TODO(tommyt): crbug.com/505554. Change the |callback| parameter below to
      * be of type PaymentInstrument.InstrumentDetailsCallback, once this JNI bug
      * has been resolved.
      */
     private static native void nativeInvokePaymentApp(WebContents webContents, long registrationId,
             String optionId, String origin, PaymentMethodData[] methodData, PaymentItem total,
             PaymentDetailsModifier[] modifiers, Object callback);
 }