Provide shipping in PaymentRequest response

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 478 matching lines @@
             if (mPaymentInformationCallback != null) provideDefaultPaymentInformation();
         }
     }
 
     /**
      * Called after retrieving instrument details.
      */
     @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);
     }
 
     /**
      * Called if unable to retrieve instrument details.
      */
     @Override
     public void onInstrumentDetailsError() {
         disconnectFromClientWithDebugMessage("Fialed to retrieve payment instrument details");
         closeUI(false);
@@ skipping 24 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;
         }
     }
 }