[Payments] Remove "total" from IS_READY_TO_PAY

Bug: 740257
Change-Id: Ib4b52311d30a663695f18ca6140b74531cb0d583
Reviewed-on: https://chromium-review.googlesource.com/581734Reviewed-by: Rouslan Solomakhin <rouslan@chromium.org>
Commit-Queue: Ganggui Tang <gogerald@chromium.org>
Cr-Commit-Position: refs/heads/master@{#488700}

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

@@ -140,7 +140,7 @@ public class AndroidPaymentApp
 
     @Override
     public void getInstruments(Map<String, PaymentMethodData> methodDataMap, String origin,
-            String iframeOrigin, @Nullable byte[][] certificateChain, PaymentItem total,
+            String iframeOrigin, @Nullable byte[][] certificateChain,
             InstrumentsCallback callback) {
         assert mMethodNames.containsAll(methodDataMap.keySet());
         assert mInstrumentsCallback
@@ -171,7 +171,7 @@ public class AndroidPaymentApp
 
         mIsReadyToPayIntent.putExtras(buildExtras(null /* id */, null /* merchantName */,
                 removeUrlScheme(origin), removeUrlScheme(iframeOrigin), certificateChain,
-                methodDataMap, total, null /* displayItems */, null /* modifiers */));
+                methodDataMap, null /* total */, null /* displayItems */, null /* modifiers */));
         try {
             if (!ContextUtils.getApplicationContext().bindService(
                         mIsReadyToPayIntent, mServiceConnection, Context.BIND_AUTO_CREATE)) {
@@ -353,7 +353,7 @@ public class AndroidPaymentApp
 
     private static Bundle buildExtras(@Nullable String id, @Nullable String merchantName,
             String origin, String iframeOrigin, @Nullable byte[][] certificateChain,
-            Map<String, PaymentMethodData> methodDataMap, PaymentItem total,
+            Map<String, PaymentMethodData> methodDataMap, @Nullable PaymentItem total,
             @Nullable List<PaymentItem> displayItems,
             @Nullable Map<String, PaymentDetailsModifier> modifiers) {
         Bundle extras = new Bundle();
@@ -387,9 +387,11 @@ public class AndroidPaymentApp
             extras.putString(EXTRA_MODIFIERS, serializeModifiers(modifiers.values()));
         }
 
-        String serializedTotalAmount = serializeTotalAmount(total.amount);
-        extras.putString(EXTRA_TOTAL,
-                serializedTotalAmount == null ? EMPTY_JSON_DATA : serializedTotalAmount);
+        if (total != null) {
+            String serializedTotalAmount = serializeTotalAmount(total.amount);
+            extras.putString(EXTRA_TOTAL,
+                    serializedTotalAmount == null ? EMPTY_JSON_DATA : serializedTotalAmount);
+        }
 
         return addDeprecatedExtras(id, origin, iframeOrigin, serializedCertificateChain,
                 methodDataMap, methodDataBundle, total, displayItems, extras);
@@ -398,7 +400,7 @@ public class AndroidPaymentApp
     private static Bundle addDeprecatedExtras(@Nullable String id, String origin,
             String iframeOrigin, @Nullable Parcelable[] serializedCertificateChain,
             Map<String, PaymentMethodData> methodDataMap, Bundle methodDataBundle,
-            PaymentItem total, @Nullable List<PaymentItem> displayItems, Bundle extras) {
+            @Nullable PaymentItem total, @Nullable List<PaymentItem> displayItems, Bundle extras) {
         if (id != null) extras.putString(EXTRA_DEPRECATED_ID, id);
 
         extras.putString(EXTRA_DEPRECATED_ORIGIN, origin);
@@ -445,17 +447,19 @@ public class AndroidPaymentApp
     }
 
     private static String serializeDetails(
-            PaymentItem total, @Nullable List<PaymentItem> displayItems) {
+            @Nullable PaymentItem total, @Nullable List<PaymentItem> displayItems) {
         StringWriter stringWriter = new StringWriter();
         JsonWriter json = new JsonWriter(stringWriter);
         try {
             // details {{{
             json.beginObject();
 
-            // total {{{
-            json.name("total");
-            serializePaymentItem(total, json);
-            // }}} total
+            if (total != null) {
+                // total {{{
+                json.name("total");
+                serializePaymentItem(total, json);
+                // }}} total
+            }
 
             // displayitems {{{
             if (displayItems != null) {

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

@@ -15,7 +15,6 @@ import org.chromium.chrome.browser.autofill.PersonalDataManager.CreditCard;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.payments.mojom.BasicCardNetwork;
 import org.chromium.payments.mojom.BasicCardType;
-import org.chromium.payments.mojom.PaymentItem;
 import org.chromium.payments.mojom.PaymentMethodData;
 
 import java.util.ArrayList;
@@ -49,7 +48,7 @@ public class AutofillPaymentApp implements PaymentApp {
 
     @Override
     public void getInstruments(Map<String, PaymentMethodData> methodDataMap, String unusedOrigin,
-            String unusedIFRameOrigin, byte[][] unusedCertificateChain, PaymentItem unusedTotal,
+            String unusedIFRameOrigin, byte[][] unusedCertificateChain,
             final InstrumentsCallback callback) {
         PersonalDataManager pdm = PersonalDataManager.getInstance();
         List<CreditCard> cards = pdm.getCreditCardsToSuggest();

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

@@ -4,7 +4,6 @@
 
 package org.chromium.chrome.browser.payments;
 
-import org.chromium.payments.mojom.PaymentItem;
 import org.chromium.payments.mojom.PaymentMethodData;
 
 import java.util.List;
@@ -44,13 +43,10 @@ public interface PaymentApp {
      *                         if PaymentRequest was not invoked from inside an iframe.
      * @param certificateChain The site certificate chain of the merchant. Null for localhost and
      *                         file on disk, which are secure origins without SSL.
-     * @param total            The total amount that can be used to filter out instruments with
-     *                         insufficient funds.
      * @param callback         The object that will receive the list of instruments.
      */
     void getInstruments(Map<String, PaymentMethodData> methodDataMap, String origin,
-            String iframeOrigin, @Nullable byte[][] certificateChain, PaymentItem total,
-            InstrumentsCallback callback);
+            String iframeOrigin, @Nullable byte[][] certificateChain, InstrumentsCallback callback);
 
     /**
      * Returns a list of all payment method names that this app supports. For example, ["visa",

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

@@ -738,8 +738,8 @@ public class PaymentRequestImpl implements PaymentRequest, PaymentRequestUI.Clie
         if (disconnectIfNoPaymentMethodsSupported()) return;
 
         for (Map.Entry<PaymentApp, Map<String, PaymentMethodData>> q : queryApps.entrySet()) {
-            q.getKey().getInstruments(q.getValue(), mTopLevelOrigin, mPaymentRequestOrigin,
-                    mCertificateChain, mRawTotal, this);
+            q.getKey().getInstruments(
+                    q.getValue(), mTopLevelOrigin, mPaymentRequestOrigin, mCertificateChain, this);
         }
     }
 

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

@@ -69,7 +69,7 @@ public class ServiceWorkerPaymentApp extends PaymentInstrument implements Paymen
     @Override
     public void getInstruments(Map<String, PaymentMethodData> unusedMethodDataMap,
             String unusedOrigin, String unusedIFrameOrigin, byte[][] unusedCertificateChain,
-            PaymentItem unusedItem, final InstrumentsCallback callback) {
+            final InstrumentsCallback callback) {
         new Handler().post(new Runnable() {
             @Override
             public void run() {

chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestCommon.java

@@ -954,7 +954,7 @@ final class PaymentRequestTestCommon implements PaymentRequestObserverForTest,
 
         @Override
         public void getInstruments(Map<String, PaymentMethodData> methodData, String origin,
-                String iframeOrigin, byte[][] certificateChain, PaymentItem total,
+                String iframeOrigin, byte[][] certificateChain,
                 InstrumentsCallback instrumentsCallback) {
             mCallback = instrumentsCallback;
             respond();