Android payment apps.

chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPaymentInstrument.java

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPaymentInstrument.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPaymentInstrument.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPaymentInstrument.java
index 7eadfb297190f4f60ab27f16d16d2b45343c95c0..940262241f3fb888352d8db7ad1b9f62429ca8af 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPaymentInstrument.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPaymentInstrument.java
@@ -4,9 +4,12 @@
 
 package org.chromium.chrome.browser.payments;
 
+import android.content.Context;
+import android.graphics.drawable.Drawable;
 import android.text.TextUtils;
 import android.util.JsonWriter;
 
+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;
@@ -27,11 +30,12 @@ import javax.annotation.Nullable;
  */
 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;
+    @Nullable private InstrumentDetailsCallback mCallback;
 
     /**
      * Builds a payment instrument for the given credit card.
@@ -40,10 +44,12 @@ public class AutofillPaymentInstrument
      * @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());
+                ApiCompatibilityUtils.getDrawable(
+                        context.getResources(), card.getIssuerIconDrawableId()));
+        mContext = context;
         mWebContents = webContents;
         mCard = card;
         mIsComplete = false;
@@ -51,13 +57,14 @@ public class AutofillPaymentInstrument
     }
 
     @Override
-    public String getMethodName() {
+    public String getInstrumentMethodName() {
         return mCard.getBasicCardPaymentType();
     }
 
     @Override
-    public void getDetails(String unusedMerchantName, String unusedOrigin, PaymentItem unusedTotal,
-            List<PaymentItem> unusedCart, JSONObject unusedDetails, DetailsCallback callback) {
+    public void getInstrumentDetails(String unusedMerchantName, String unusedOrigin,
+            PaymentItem unusedTotal, List<PaymentItem> unusedCart, JSONObject unusedDetails,
+            InstrumentDetailsCallback callback) {
         assert mIsComplete;
         assert mCallback == null;
         mCallback = callback;
@@ -125,7 +132,7 @@ public class AutofillPaymentInstrument
     }
 
     @Override
-    public void dismiss() {}
+    public void dismissInstrument() {}
 
     /** @return Whether the card is complete and ready to be sent to the merchant as-is. */
     public boolean isComplete() {
@@ -155,7 +162,8 @@ public class AutofillPaymentInstrument
         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. */