PaymentHandler: Replace GetAllManifests() with GetAllPaymentApps().

chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestServiceWorkerPaymentAppTest.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.support.test.filters.MediumTest;
 
 import org.chromium.base.test.util.Feature;
 import org.chromium.content_public.browser.WebContents;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
 
 /**
  * A payment integration test for service worker based payment apps.
  */
 public class PaymentRequestServiceWorkerPaymentAppTest extends PaymentRequestTestBase {
     /** Flag for installing a service worker payment app without any payment options. */
     private static final int NO_OPTIONS = 0;
@@ skipping 13 matching lines @@
      *
      * @param instrumentPresence Whether the manifest has any payment options. Either NO_OPTIONS
      *                           ONE_OPTION or TWO_OPTIONS
      */
     private void installMockServiceWorkerPaymentApp(final int instrumentPresence) {
         PaymentAppFactory.getInstance().addAdditionalFactory(
                 new PaymentAppFactory.PaymentAppFactoryAddition() {
                     @Override
                     public void create(WebContents webContents, Set<String> methodNames,
                             PaymentAppFactory.PaymentAppCreatedCallback callback) {
-                        ServiceWorkerPaymentAppBridge.Manifest testManifest =
-                                new ServiceWorkerPaymentAppBridge.Manifest();
-                        testManifest.registrationId = 0;
-                        testManifest.label = "BobPay";
+                        List<PaymentInstrument> instruments = new ArrayList<PaymentInstrument>();
 
                         if (instrumentPresence != NO_OPTIONS) {
-                            ServiceWorkerPaymentAppBridge.Option testOption =
-                                    new ServiceWorkerPaymentAppBridge.Option();
-                            testOption.id = "new";
-                            testOption.label = "Create BobPay account";
-                            testOption.enabledMethods =
-                                Arrays.asList("https://bobpay.com", "basic-card");
-                            testManifest.options.add(testOption);
+                            instruments.add(new ServiceWorkerPaymentInstrument(webContents,
+                                    0 /* swRegistrationId */, "new" /* instrumentId */,
+                                    "Create BobPay account" /* label */,
+                                    new HashSet<String>(Arrays.asList("https://bobpay.com",
+                                            "basic-card")) /* methodNames */));
                         }
 
                         if (instrumentPresence == TWO_OPTIONS) {
-                            ServiceWorkerPaymentAppBridge.Option testOption =
-                                    new ServiceWorkerPaymentAppBridge.Option();
-                            testOption.id = "existing";
-                            testOption.label = "Existing BobPay account";
-                            testOption.enabledMethods =
-                                Arrays.asList("https://bobpay.com", "basic-card");
-                            testManifest.options.add(testOption);
+                            instruments.add(new ServiceWorkerPaymentInstrument(webContents,
+                                    0 /* swRegistrationId */, "existing" /* instrumentId */,
+                                    "Existing BobPay account" /* label */,
+                                    new HashSet<String>(Arrays.asList("https://bobpay.com",
+                                            "basic-card")) /* methodNames */));
                         }
 
                         callback.onPaymentAppCreated(
-                                new ServiceWorkerPaymentApp(webContents, testManifest));
+                                new ServiceWorkerPaymentApp(webContents, instruments));
                         callback.onAllPaymentAppsCreated();
                     }
                 });
     }
 
     @Override
     public void onMainActivityStarted() throws InterruptedException, ExecutionException,
             TimeoutException {}
 
     @MediumTest
@@ skipping 19 matching lines @@
     @MediumTest
     @Feature({"Payments"})
     public void testTwoOptions() throws InterruptedException, ExecutionException,
             TimeoutException {
         installMockServiceWorkerPaymentApp(TWO_OPTIONS);
         triggerUIAndWait(mReadyForInput);
         // TODO(tommyt): crbug.com/669876. Expand this test as we implement more
         // service worker based payment app functionality.
     }
 }