[Merge M-53] Show progress spinner when waiting for shipping options update.

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 165cfe49651a34cdf298d3c30ac04f6caf493b64..38b86b91fe0b433dae4735b8533855c3bd77495e 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
@@ -606,9 +606,11 @@ public class PaymentRequestUI implements DialogInterface.OnDismissListener, View
             mShippingAddressSectionInformation.setSelectedItem(option);
             result = mClient.onSectionOptionSelected(
                     TYPE_SHIPPING_ADDRESSES, option, mUpdateSectionsCallback);
-        } else if (section == mShippingOptionSection) {
+        } else if (section == mShippingOptionSection
+                && mShippingOptionsSectionInformation.getSelectedItem() != option) {
             mShippingOptionsSectionInformation.setSelectedItem(option);
-            result = mClient.onSectionOptionSelected(TYPE_SHIPPING_OPTIONS, option, null);
+            result = mClient.onSectionOptionSelected(
+                    TYPE_SHIPPING_OPTIONS, option, mUpdateSectionsCallback);
         } else if (section == mContactDetailsSection) {
             mContactDetailsSectionInformation.setSelectedItem(option);
             result = mClient.onSectionOptionSelected(TYPE_CONTACT_DETAILS, option, null);