Add shippingOption to PaymentResponse

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 658 matching lines @@
         if (selectedShippingAddress != null) {
             // Shipping addresses are created in show(). The should all be instances of
             // AutofillAddress.
             assert selectedShippingAddress instanceof AutofillAddress;
             response.shippingAddress =
                     ((AutofillAddress) selectedShippingAddress).toPaymentAddress();
         }
 
         PaymentOption selectedShippingOption = mUiShippingOptions.getSelectedItem();
         if (selectedShippingOption != null && selectedShippingOption.getIdentifier() != null) {
-            response.shippingOptionId = selectedShippingOption.getIdentifier();
+            response.shippingOption = selectedShippingOption.getIdentifier();
         }
 
         mClient.onPaymentResponse(response);
     }
 
     /**
      * Called if unable to retrieve instrument details.
      */
     @Override
     public void onInstrumentDetailsError() {
@@ skipping 35 matching lines @@
     private void closeClient() {
         if (mClient != null) mClient.close();
         mClient = null;
     }
 
     @VisibleForTesting
     public static void setObserverForTest(PaymentRequestServiceObserverForTest observerForTest) {
         sObserverForTest = observerForTest;
     }
 }