Revert of PaymentRequest shipping address labels.

chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java

 // Copyright 2013 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.autofill;
 
 import android.content.Context;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
@@ skipping 455 matching lines @@
     /**
      * Unregisters the provided observer.
      */
     public void unregisterDataObserver(PersonalDataManagerObserver observer) {
         ThreadUtils.assertOnUiThread();
         assert (mDataObservers.size() > 0);
         assert (mDataObservers.contains(observer));
         mDataObservers.remove(observer);
     }
 
-    public List<AutofillProfile> getProfiles(boolean addressOnly) {
+    public List<AutofillProfile> getProfiles() {
         ThreadUtils.assertOnUiThread();
 
-        String[] profileLabels = nativeGetProfileLabels(mPersonalDataManagerAndroid, addressOnly);
+        String[] profileLabels = nativeGetProfileLabels(mPersonalDataManagerAndroid);
 
         int profileCount = nativeGetProfileCount(mPersonalDataManagerAndroid);
         List<AutofillProfile> profiles = new ArrayList<AutofillProfile>(profileCount);
         for (int i = 0; i < profileCount; i++) {
             AutofillProfile profile = nativeGetProfileByIndex(mPersonalDataManagerAndroid, i);
             profile.setLabel(profileLabels[i]);
             profiles.add(profile);
         }
 
         return profiles;
@@ skipping 81 matching lines @@
     /**
      * Enables or disables the Payments integration.
      * @param enable True to enable Payments data import.
      */
     public static void setPaymentsIntegrationEnabled(boolean enable) {
         nativeSetPaymentsIntegrationEnabled(enable);
     }
 
     private native long nativeInit();
     private native int nativeGetProfileCount(long nativePersonalDataManagerAndroid);
-    private native String[] nativeGetProfileLabels(long nativePersonalDataManagerAndroid,
-            boolean addressOnly);
+    private native String[] nativeGetProfileLabels(long nativePersonalDataManagerAndroid);
     private native AutofillProfile nativeGetProfileByIndex(long nativePersonalDataManagerAndroid,
             int index);
     private native AutofillProfile nativeGetProfileByGUID(long nativePersonalDataManagerAndroid,
             String guid);
     private native String nativeSetProfile(long nativePersonalDataManagerAndroid,
             AutofillProfile profile);
     private native int nativeGetCreditCardCount(long nativePersonalDataManagerAndroid);
     private native CreditCard nativeGetCreditCardByIndex(long nativePersonalDataManagerAndroid,
             int index);
     private native CreditCard nativeGetCreditCardByGUID(long nativePersonalDataManagerAndroid,
             String guid);
     private native String nativeSetCreditCard(long nativePersonalDataManagerAndroid,
             CreditCard card);
     private native void nativeRemoveByGUID(long nativePersonalDataManagerAndroid, String guid);
     private native void nativeClearUnmaskedCache(
             long nativePersonalDataManagerAndroid, String guid);
     private native void nativeGetFullCardForPaymentRequest(long nativePersonalDataManagerAndroid,
             WebContents webContents, String guid, FullCardRequestDelegate delegate);
     private static native boolean nativeIsAutofillEnabled();
     private static native void nativeSetAutofillEnabled(boolean enable);
     private static native boolean nativeIsAutofillManaged();
     private static native boolean nativeIsPaymentsIntegrationEnabled();
     private static native void nativeSetPaymentsIntegrationEnabled(boolean enable);
     private static native String nativeToCountryCode(String countryName);
 }