Provide shipping address only to merchants that need it.

chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.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.app.Activity;
 import android.graphics.Bitmap;
 import android.os.Handler;
 import android.text.TextUtils;
@@ skipping 57 matching lines @@
     private List<LineItem> mLineItems;
     private SectionInformation mShippingOptions;
     private JSONObject mData;
     private SectionInformation mShippingAddresses;
     private List<PaymentApp> mPendingApps;
     private List<PaymentInstrument> mPendingInstruments;
     private SectionInformation mPaymentMethods;
     private PaymentRequestUI mUI;
     private Callback<PaymentInformation> mPaymentInformationCallback;
     private Pattern mRegionCodePattern;
+    private boolean mMerchantNeedsShippingAddress;
 
     /**
      * Builds the dialog.
      *
      * @param webContents The web contents that have invoked the PaymentRequest API.
      */
     public PaymentRequestImpl(WebContents webContents) {
         if (webContents == null) return;
 
         ContentViewCore contentViewCore = ContentViewCore.fromWebContents(webContents);
@@ skipping 72 matching lines @@
         }
         mPaymentItems = Arrays.asList(details.items);
 
         mShippingOptions =
                 getValidatedShippingOptions(details.items[0].amount.currencyCode, details);
         if (mShippingOptions == null) {
             disconnectFromClientWithDebugMessage("Invalid shipping options");
             return;
         }
 
+        // If the merchant requests shipping and does not provide shipping options here, then the
+        // merchant needs the shipping address to calculate shipping price and availability.
+        boolean requestShipping = options != null && options.requestShipping;
+        mMerchantNeedsShippingAddress = requestShipping && mShippingOptions.isEmpty();
+
         mData = getValidatedData(mSupportedMethods, stringifiedData);
         if (mData == null) {
             disconnectFromClientWithDebugMessage("Invalid payment method specific data");
             return;
         }
 
         List<AutofillAddress> addresses = new ArrayList<>();
         List<AutofillProfile> profiles = PersonalDataManager.getInstance().getAddressOnlyProfiles();
         for (int i = 0; i < profiles.size(); i++) {
             AutofillProfile profile = profiles.get(i);
@@ skipping 24 matching lines @@
             Set<String> appMethods = app.getSupportedMethodNames();
             appMethods.retainAll(mSupportedMethods);
             if (!appMethods.isEmpty()) {
                 isGettingInstruments = true;
                 app.getInstruments(mPaymentItems, this);
             }
         }
 
         if (!isGettingInstruments) mPaymentMethods = new SectionInformation();
 
-        boolean requestShipping = options != null && options.requestShipping;
         mUI = new PaymentRequestUI(mContext, this, requestShipping, mMerchantName, mOrigin);
         if (mFavicon != null) mUI.setTitleBitmap(mFavicon);
         mFavicon = null;
     }
 
     private HashSet<String> getValidatedSupportedMethods(String[] methods) {
         // Payment methods are required.
         if (methods == null || methods.length == 0) return null;
 
         HashSet<String> result = new HashSet<>();
@@ skipping 162 matching lines @@
             public void run() {
                 callback.onResult(mPaymentMethods);
             }
         });
     }
 
     @Override
     public void onShippingAddressChanged(PaymentOption selectedShippingAddress) {
         assert selectedShippingAddress instanceof AutofillAddress;
         mShippingAddresses.setSelectedItem(selectedShippingAddress);
-        mClient.onShippingAddressChange(
-                ((AutofillAddress) selectedShippingAddress).toShippingAddress());
+        if (mMerchantNeedsShippingAddress) {
+            mClient.onShippingAddressChange(
+                    ((AutofillAddress) selectedShippingAddress).toShippingAddress());
+        }
     }
 
     @Override
     public void onShippingOptionChanged(PaymentOption selectedShippingOption) {
         mShippingOptions.setSelectedItem(selectedShippingOption);
         mClient.onShippingOptionChange(selectedShippingOption.getIdentifier());
     }
 
     @Override
     public void onPaymentMethodChanged(PaymentOption selectedPaymentMethod) {
@@ skipping 126 matching lines @@
         if (mPaymentMethods != null) {
             for (int i = 0; i < mPaymentMethods.getSize(); i++) {
                 PaymentOption option = mPaymentMethods.getItem(i);
                 assert option instanceof PaymentInstrument;
                 ((PaymentInstrument) option).dismiss();
             }
             mPaymentMethods = null;
         }
     }
 }