Android payment apps.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentInstrument.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentInstrument.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentInstrument.java
index 0f59bb66f36d772797c61231d8692677c9d3c4d4..b6a62451fdd0f5150e240b7a274407f91ad6fcef 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentInstrument.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentInstrument.java
@@ -4,12 +4,15 @@
 
 package org.chromium.chrome.browser.payments;
 
+import android.graphics.drawable.Drawable;
+
 import org.chromium.chrome.browser.payments.ui.PaymentOption;
 import org.chromium.mojom.payments.PaymentItem;
 
 import org.json.JSONObject;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * The base class for a single payment instrument, e.g., a credit card.
@@ -18,7 +21,7 @@ public abstract class PaymentInstrument extends PaymentOption {
     /**
      * The interface for the requester of instrument details.
      */
-    public interface DetailsCallback {
+    public interface InstrumentDetailsCallback {
         /**
          * Called after retrieving instrument details.
          *
@@ -33,17 +36,17 @@ public abstract class PaymentInstrument extends PaymentOption {
         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
+     * Returns a method name for this instrument, e.g., "visa" or "mastercard" in basic card
+     * payments: https://w3c.github.io/webpayments-methods-card/#method-id
      *
-     * @return The method name for this instrument.
+     * @return The method names for this instrument.
      */
-    public abstract String getMethodName();
+    public abstract String getInstrumentMethodName();
 
     /**
      * Asynchronously retrieves the instrument details and invokes the callback with the result.
@@ -56,12 +59,12 @@ public abstract class PaymentInstrument extends PaymentOption {
      *                     in test or production key, a merchant identifier, or a public key.
      * @param callback     The object that will receive the instrument details.
      */
-    public abstract void getDetails(String merchantName, String origin, PaymentItem total,
-            List<PaymentItem> cart, JSONObject details, DetailsCallback callback);
+    public abstract void getInstrumentDetails(String merchantName, String origin, PaymentItem total,
+            List<PaymentItem> cart, JSONObject details, InstrumentDetailsCallback callback);
 
     /**
      * Cleans up any resources held by the payment instrument. For example, closes server
      * connections.
      */
-    public abstract void dismiss();
+    public abstract void dismissInstrument();
 }