PaymentRequest: Rename ShippingAddress to PaymentAddress.

chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillAddress.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 org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
 import org.chromium.chrome.browser.payments.ui.PaymentOption;
-import org.chromium.mojom.payments.ShippingAddress;
+import org.chromium.mojom.payments.PaymentAddress;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
  * The locally stored autofill address.
  */
 public class AutofillAddress extends PaymentOption {
     /**
      * The pattern for a valid region code.
@@ skipping 27 matching lines @@
         assert profile.getSortingCode() != null : "Sorting code should not be null";
         assert profile.getCompanyName() != null : "Company name should not be null";
         assert profile.getFullName() != null : "Full name should not be null";
 
         mProfile = profile;
     }
 
     /**
      * Returns the shipping address for mojo.
      */
-    public ShippingAddress toShippingAddress() {
-        ShippingAddress result = new ShippingAddress();
+    public PaymentAddress toPaymentAddress() {
+        PaymentAddress result = new PaymentAddress();
 
         result.regionCode = mProfile.getCountryCode();
         result.addressLine = mProfile.getStreetAddress().split("\n");
         result.administrativeArea = mProfile.getRegion();
         result.locality = mProfile.getLocality();
         result.dependentLocality = mProfile.getDependentLocality();
         result.postalCode = mProfile.getPostalCode();
         result.sortingCode = mProfile.getSortingCode();
         result.organization = mProfile.getCompanyName();
         result.recipient = mProfile.getFullName();
@@ skipping 11 matching lines @@
             String languageCode = mLanguageScriptCodeMatcher.group(LANGUAGE_CODE_GROUP);
             result.languageCode = languageCode != null ? languageCode : "";
 
             String scriptCode = mLanguageScriptCodeMatcher.group(SCRIPT_CODE_GROUP);
             result.scriptCode = scriptCode != null ? scriptCode : "";
         }
 
         return result;
     }
 }