Make PaymentOption store a Drawable instead of id

chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPaymentInstrument.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.text.TextUtils;
 import android.util.JsonWriter;
 
+import org.json.JSONObject;
+
+import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.browser.autofill.PersonalDataManager;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.CreditCard;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.FullCardRequestDelegate;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.payments.mojom.PaymentItem;
 
-import org.json.JSONObject;
-
 import java.io.IOException;
 import java.io.StringWriter;
 import java.util.List;
 
 import javax.annotation.Nullable;
 
 /**
  * The locally stored credit card payment instrument.
  */
 public class AutofillPaymentInstrument
         extends PaymentInstrument implements FullCardRequestDelegate {
+    private final Context mContext;
     private final WebContents mWebContents;
     private CreditCard mCard;
     private boolean mIsComplete;
     @Nullable private AutofillProfile mBillingAddress;
     @Nullable private DetailsCallback mCallback;
 
     /**
      * Builds a payment instrument for the given credit card.
      *
      * @param webContents    The web contents where PaymentRequest was invoked.
      * @param card           The autofill card that can be used for payment.
      * @param billingAddress The billing address for the card.
      */
-    public AutofillPaymentInstrument(
-            WebContents webContents, CreditCard card, @Nullable AutofillProfile billingAddress) {
+    public AutofillPaymentInstrument(Context context, WebContents webContents, CreditCard card,
+            @Nullable AutofillProfile billingAddress) {
         super(card.getGUID(), card.getObfuscatedNumber(), card.getName(),
-                card.getIssuerIconDrawableId());
+                card.getIssuerIconDrawableId() < 1

[please use gerrit instead, 2016/10/20 15:22:18]

"== 0" should be sufficient instead of "< 1".
https://developer.android.com/reference/android/content/res/Resources.html#ge...
says that only "0" is an invalid value.

+                ? null
+                : ApiCompatibilityUtils.getDrawable(
+                        context.getResources(), card.getIssuerIconDrawableId()));
+        mContext = context;
         mWebContents = webContents;
         mCard = card;
         mIsComplete = false;
         mBillingAddress = billingAddress;
     }
 
     @Override
     public String getMethodName() {
         return mCard.getBasicCardPaymentType();
     }
@@ skipping 84 matching lines @@
      * instrument.
      *
      * @param card           The new credit card to use. The GUID should not change.
      * @param billingAddress The billing address for the card. The GUID should match the billing
      *                       address ID of the new card to use.
      */
     public void completeInstrument(CreditCard card, AutofillProfile billingAddress) {
         assert card != null;
         assert billingAddress != null;
         assert card.getBillingAddressId() != null;
         assert card.getBillingAddressId().equals(billingAddress.getGUID());

[please use gerrit instead, 2016/10/20 15:22:18]

Please add this line:

assert card.getIssuerIconDraweableId() != 0;

 
         mCard = card;
         mBillingAddress = billingAddress;
         mIsComplete = true;
         updateIdentifierLabelsAndIcon(card.getGUID(), card.getObfuscatedNumber(), card.getName(),
-                null, card.getIssuerIconDrawableId());
+                null, ApiCompatibilityUtils.getDrawable(
+                              mContext.getResources(), card.getIssuerIconDrawableId()));
     }
 
     /** @return The credit card represented by this payment instrument. */
     public CreditCard getCard() {
         return mCard;
     }
 }