Make PaymentOption store a Drawable instead of id

chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentInstrument.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.json.JSONObject;
+
 import org.chromium.chrome.browser.payments.ui.PaymentOption;
 import org.chromium.payments.mojom.PaymentItem;
 
-import org.json.JSONObject;
-
 import java.util.List;
 
 /**
  * The base class for a single payment instrument, e.g., a credit card.
  */
 public abstract class PaymentInstrument extends PaymentOption {
     /**
      * The interface for the requester of instrument details.
      */
     public interface DetailsCallback {
         /**
          * Called after retrieving instrument details.
          *
          * @param methodName         Method name. For example, "visa".
          * @param stringifiedDetails JSON-serialized object. For example, {"card": "123"}.
          */
         void onInstrumentDetailsReady(String methodName, String stringifiedDetails);
 
         /**
          * Called if unable to retrieve instrument details.
          */
         void onInstrumentDetailsError();
     }
 
-    protected PaymentInstrument(String id, String label, String sublabel, int icon) {
+    protected PaymentInstrument(String id, String label, String sublabel, Drawable icon) {
         super(id, label, sublabel, icon);
     }
 
     /**
      * Returns the method name for this instrument, e.g., "visa" or "mastercard" in basic card
      * payments: https://w3c.github.io/browser-payment-api/specs/basic-card-payment.html#method-id
      *
      * @return The method name for this instrument.
      */
     public abstract String getMethodName();
@@ skipping 11 matching lines @@
      */
     public abstract void getDetails(String merchantName, String origin, PaymentItem total,
             List<PaymentItem> cart, JSONObject details, DetailsCallback callback);
 
     /**
      * Cleans up any resources held by the payment instrument. For example, closes server
      * connections.
      */
     public abstract void dismiss();
 }