PaymentRequest: Rename ShippingAddress to PaymentAddress.

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 437 matching lines @@
     }
 
     @Override
     public void onSectionOptionChanged(
             @PaymentRequestUI.DataType int optionType, PaymentOption option) {
         if (optionType == PaymentRequestUI.TYPE_SHIPPING_ADDRESSES) {
             // This may update the line items and/or the shipping options.
             assert option instanceof AutofillAddress;
             mShippingAddressesSection.setSelectedItem(option);
             if (mMerchantNeedsShippingAddress) {
-                mClient.onShippingAddressChange(((AutofillAddress) option).toShippingAddress());
+                mClient.onShippingAddressChange(((AutofillAddress) option).toPaymentAddress());
             }
         } else if (optionType == PaymentRequestUI.TYPE_SHIPPING_OPTIONS) {
             // This may update the line items.
             mShippingOptionsSection.setSelectedItem(option);
             mClient.onShippingOptionChange(option.getIdentifier());
         } else if (optionType == PaymentRequestUI.TYPE_PAYMENT_METHODS) {
             assert option instanceof PaymentInstrument;
             mPaymentMethodsSection.setSelectedItem(option);
         }
     }
@@ skipping 95 matching lines @@
         PaymentResponse response = new PaymentResponse();
         response.methodName = methodName;
         response.stringifiedDetails = stringifiedDetails;
 
         PaymentOption selectedShippingAddress = mShippingAddressesSection.getSelectedItem();
         if (selectedShippingAddress != null) {
             // Shipping addresses are created in show(). The should all be instances of
             // AutofillAddress.
             assert selectedShippingAddress instanceof AutofillAddress;
             response.shippingAddress =
-                    ((AutofillAddress) selectedShippingAddress).toShippingAddress();
+                    ((AutofillAddress) selectedShippingAddress).toPaymentAddress();
         }
 
         PaymentOption selectedShippingOption = mShippingOptionsSection.getSelectedItem();
         if (selectedShippingOption != null && selectedShippingOption.getIdentifier() != null) {
             response.shippingOptionId = selectedShippingOption.getIdentifier();
         }
 
         mClient.onPaymentResponse(response);
     }
 
@@ skipping 35 matching lines @@
             }
             mPaymentMethodsSection = null;
         }
     }
 
     private void closeClient() {
         if (mClient != null) mClient.close();
         mClient = null;
     }
 }