Revert of Make PaymentOption store a Drawable instead of id

chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPaymentApp.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.os.Handler;
 import android.text.TextUtils;
 
-import org.json.JSONObject;
-
 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.content_public.browser.WebContents;
 
+import org.json.JSONObject;
+
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
 /**
  * Provides access to locally stored user credit cards.
  */
 public class AutofillPaymentApp implements PaymentApp {
-    private final Context mContext;
     private final WebContents mWebContents;
 
     /**
      * Builds a payment app backed by autofill cards.
      *
-     * @param context     The context.
      * @param webContents The web contents where PaymentRequest was invoked.
      */
-    public AutofillPaymentApp(Context context, WebContents webContents) {
-        mContext = context;
+    public AutofillPaymentApp(WebContents webContents) {
         mWebContents = webContents;
     }
 
     @Override
     public void getInstruments(JSONObject unusedDetails, final InstrumentsCallback callback) {
         PersonalDataManager pdm = PersonalDataManager.getInstance();
         List<CreditCard> cards = pdm.getCreditCardsToSuggest();
         final List<PaymentInstrument> instruments = new ArrayList<>(cards.size());
 
         for (int i = 0; i < cards.size(); i++) {
             CreditCard card = cards.get(i);
             AutofillProfile billingAddress = TextUtils.isEmpty(card.getBillingAddressId())
                     ? null : pdm.getProfile(card.getBillingAddressId());
-            instruments.add(new AutofillPaymentInstrument(mContext, mWebContents, card,
-                    billingAddress));
+            instruments.add(new AutofillPaymentInstrument(mWebContents, card, billingAddress));
         }
 
         new Handler().post(new Runnable() {
             @Override
             public void run() {
                 callback.onInstrumentsReady(AutofillPaymentApp.this, instruments);
             }
         });
     }
 
@@ skipping 18 matching lines @@
         methods.add("generic");
 
         return methods;
     }
 
     @Override
     public String getIdentifier() {
         return "Chrome_Autofill_Payment_App";
     }
 }