Revert of PaymentRequest shipping address labels.

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;
 
@@ skipping 15 matching lines @@
     private static final int LANGUAGE_CODE_GROUP = 1;
     private static final int SCRIPT_CODE_GROUP = 3;
 
     private final AutofillProfile mProfile;
     private Matcher mLanguageScriptCodeMatcher;
 
     /**
      * Builds for the autofill address.
      */
     public AutofillAddress(AutofillProfile profile) {
-        super(profile.getGUID(), profile.getLabel(), profile.getFullName(), PaymentOption.NO_ICON);
+        super(profile.getGUID(), profile.getFullName(), profile.getStreetAddress(),
+                PaymentOption.NO_ICON);
 
         assert profile.getCountryCode() != null : "Country code should not be null";
         assert Pattern.compile(REGION_CODE_PATTERN).matcher(profile.getCountryCode()).matches()
                 : "Country code should be in valid format";
 
         assert profile.getStreetAddress() != null : "Street address should not be null";
         assert profile.getRegion() != null : "Region should not be null";
         assert profile.getLocality() != null : "Locality should not be null";
         assert profile.getDependentLocality() != null : "Dependent locality should not be null";
         assert profile.getPostalCode() != null : "Postal code should not be null";
@@ skipping 33 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;
     }
 }