Revert of Make PaymentOption store a Drawable instead of id

chrome/android/java/src/org/chromium/chrome/browser/payments/CardEditor.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.os.AsyncTask;
 import android.os.Handler;
 import android.text.TextUtils;
 import android.util.Pair;
@@ skipping 246 matching lines @@
     @Override
     public void edit(@Nullable final AutofillPaymentInstrument toEdit,
             final Callback<AutofillPaymentInstrument> callback) {
         super.edit(toEdit, callback);
 
         // If |toEdit| is null, we're creating a new credit card.
         final boolean isNewCard = toEdit == null;
 
         // Ensure that |instrument| and |card| are never null.
         final AutofillPaymentInstrument instrument = isNewCard
-                ? new AutofillPaymentInstrument(mContext, mWebContents, new CreditCard(), null)
+                ? new AutofillPaymentInstrument(mWebContents, new CreditCard(), null)
                 : toEdit;
         final CreditCard card = instrument.getCard();
 
         // The title of the editor depends on whether we're adding a new card or editing an existing
         // card.
         final EditorModel editor = new EditorModel(mContext.getString(isNewCard
                 ? R.string.autofill_create_credit_card
                 : R.string.autofill_edit_credit_card));
 
         if (card.getIsLocal()) {
@@ skipping 330 matching lines @@
 
         mEditorView.update();
         mIsScanning = false;
     }
 
     @Override
     public void onScanCancelled() {
         mIsScanning = false;
     }
 }