[Payments] Implement payment instrument icons

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.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
+
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.SuppressFBWarnings;
+import org.chromium.chrome.browser.ChromeActivity;
 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.HashSet;
 import java.util.List;
 import java.util.Set;
 
@@ skipping 36 matching lines @@
                 modifiers.toArray(new PaymentDetailsModifier[0]), instrumentId, callback);
     }
 
     @CalledByNative
     private static List<PaymentInstrument> createInstrumentList() {
         return new ArrayList<PaymentInstrument>();
     }
 
     @CalledByNative
     private static void addInstrument(List<PaymentInstrument> instruments, WebContents webContents,
-            long swRegistrationId, String instrumentId, String label, String[] methodNameArray) {
+            long swRegistrationId, String instrumentId, String label, String[] methodNameArray,
+            Bitmap icon) {
+        Context context = ChromeActivity.fromWebContents(webContents);
+        if (context == null) return;
+
         Set<String> methodNames = new HashSet<String>();
         for (int i = 0; i < methodNameArray.length; i++) {
             methodNames.add(methodNameArray[i]);
         }
-        instruments.add(new ServiceWorkerPaymentInstrument(
-                webContents, swRegistrationId, instrumentId, label, methodNames));
+
+        instruments.add(
+                new ServiceWorkerPaymentInstrument(webContents, swRegistrationId, instrumentId,
+                        label, methodNames, new BitmapDrawable(context.getResources(), icon)));
     }
 
     @CalledByNative
     private static String[] getSupportedMethodsFromMethodData(PaymentMethodData data) {
         return data.supportedMethods;
     }
 
     @CalledByNative
     private static String getStringifiedDataFromMethodData(PaymentMethodData data) {
         return data.stringifiedData;
@@ skipping 60 matching lines @@
     /*
      * 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 topLevelOrigin, String paymentRequestOrigin, String paymentRequestId,
             PaymentMethodData[] methodData, PaymentItem total, PaymentDetailsModifier[] modifiers,
             String instrumentKey, Object callback);
 }