Require explicit user action for shipping address.

chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
index 1903d9b201541edbe7bc5b4c60e74ceddee9ae5b..a6c68890bd2ca4fa74ab4519cc50949a15302cb4 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
@@ -240,18 +240,27 @@ public class PaymentRequestUI implements DialogInterface.OnDismissListener, View
 
                 if (mRequestShipping) {
                     mShippingAddressesSection = result.getShippingAddresses();
-                    String selectedAddressLabel = result.getSelectedShippingAddressLabel();
-                    if (selectedAddressLabel != null) {
-                        mShippingSummaryAddress.setText(selectedAddressLabel);
-                    }
-
                     mShippingOptionsSection = result.getShippingOptions();
+
+                    String selectedAddressLabel = result.getSelectedShippingAddressLabel();
                     String selectedShippingOptionLabel = result.getSelectedShippingOptionLabel();
-                    if (selectedShippingOptionLabel != null) {
-                        mShippingSummaryOption.setText(selectedShippingOptionLabel);
+                    if (selectedAddressLabel == null && selectedShippingOptionLabel == null) {
+                        mShippingSummaryAddress.setText(mContext.getString(
+                                R.string.payments_select_shipping_prompt));
                     } else {
-                        mShippingSummaryOption.setText(mContext.getString(
-                                R.string.payments_select_shipping_option_prompt));
+                        if (selectedAddressLabel == null) {
+                            mShippingSummaryAddress.setText(mContext.getString(
+                                    R.string.payments_select_shipping_address_prompt));
+                        } else {
+                            mShippingSummaryAddress.setText(selectedAddressLabel);
+                        }
+
+                        if (selectedShippingOptionLabel == null) {
+                            mShippingSummaryOption.setText(mContext.getString(
+                                    R.string.payments_select_shipping_option_prompt));
+                        } else {
+                            mShippingSummaryOption.setText(selectedShippingOptionLabel);
+                        }
                     }
                 }