Revert of PaymentRequest shipping address labels.

chrome/browser/autofill/android/personal_data_manager_android.h

 // 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.
 
 #ifndef CHROME_BROWSER_AUTOFILL_ANDROID_PERSONAL_DATA_MANAGER_ANDROID_H_
 #define CHROME_BROWSER_AUTOFILL_ANDROID_PERSONAL_DATA_MANAGER_ANDROID_H_
 
 #include "base/android/jni_weak_ref.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/macros.h"
@@ skipping 34 matching lines @@
   // Adds or modifies a profile.  If |jguid| is an empty string, we are creating
   // a new profile.  Else we are updating an existing profile.  Always returns
   // the GUID for this profile; the GUID it may have just been created.
   base::android::ScopedJavaLocalRef<jstring> SetProfile(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& unused_obj,
       const base::android::JavaParamRef<jobject>& jprofile);
 
   // Gets the labels for all known profiles. These labels are useful for
   // distinguishing the profiles from one another.
-  //
-  // The labels never contain the full name and include at least 2 fields.
-  //
-  // If |address_only| is true, then such fields as phone number and email
-  // address are also omitted, but all fields are included in the label.
   base::android::ScopedJavaLocalRef<jobjectArray> GetProfileLabels(
       JNIEnv* env,
-      const base::android::JavaParamRef<jobject>& unused_obj,
-      bool address_only);
+      const base::android::JavaParamRef<jobject>& unused_obj);
 
   // These functions act on local credit cards.
   // --------------------
 
   // Returns the number of credit cards.
   jint GetCreditCardCount(
       JNIEnv* unused_env,
       const base::android::JavaParamRef<jobject>& unused_obj);
 
   // Returns the credit card as indexed by |index| in the PersonalDataManager's
@@ skipping 51 matching lines @@
 
   // Pointer to the PersonalDataManager for the main profile.
   PersonalDataManager* personal_data_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(PersonalDataManagerAndroid);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_AUTOFILL_ANDROID_PERSONAL_DATA_MANAGER_ANDROID_H_