Provide shipping in PaymentRequest response

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

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
index 066456948a1365b725a66e75fa0f24455e2984fd..649dbb7b303372d66c6a329f5e802a6a42b1a61b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
@@ -496,8 +496,22 @@ public class PaymentRequestImpl implements PaymentRequest, PaymentRequestUI.Clie
     @Override
     public void onInstrumentDetailsReady(String methodName, String stringifiedDetails) {
         PaymentResponse response = new PaymentResponse();
+
         response.methodName = methodName;
         response.stringifiedDetails = stringifiedDetails;
+
+        PaymentOption selectedShippingAddress = mShippingAddresses.getSelectedItem();
+        if (selectedShippingAddress != null) {
+            assert selectedShippingAddress instanceof AutofillAddress;
+            response.shippingAddress =
+                    ((AutofillAddress) selectedShippingAddress).toShippingAddress();
+        }
+
+        PaymentOption selectedShippingOption = mShippingOptions.getSelectedItem();
+        if (selectedShippingOption != null && selectedShippingOption.getIdentifier() != null) {
+            response.shippingOptionId = selectedShippingOption.getIdentifier();
+        }
+
         mClient.onPaymentResponse(response);
     }