Revert of PaymentRequest shipping address labels.

chrome/browser/autofill/android/personal_data_manager_android.cc

 // 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.
 
 #include "chrome/browser/autofill/android/personal_data_manager_android.h"
 
 #include <stddef.h>
-#include <memory>
 
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/command_line.h"
 #include "base/format_macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/android/resource_mapper.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
@@ skipping 307 matching lines @@
   } else {
     profile.set_guid(guid);
     personal_data_manager_->UpdateProfile(profile);
   }
 
   return ConvertUTF8ToJavaString(env, profile.guid());
 }
 
 ScopedJavaLocalRef<jobjectArray> PersonalDataManagerAndroid::GetProfileLabels(
     JNIEnv* env,
-    const JavaParamRef<jobject>& unused_obj,
-    bool address_only) {
-  std::unique_ptr<std::vector<ServerFieldType>> suggested_fields;
-  size_t minimal_fields_shown = 2;
-  if (address_only) {
-    suggested_fields.reset(new std::vector<ServerFieldType>);
-    suggested_fields->push_back(COMPANY_NAME);
-    suggested_fields->push_back(ADDRESS_HOME_LINE1);
-    suggested_fields->push_back(ADDRESS_HOME_LINE2);
-    suggested_fields->push_back(ADDRESS_HOME_DEPENDENT_LOCALITY);
-    suggested_fields->push_back(ADDRESS_HOME_CITY);
-    suggested_fields->push_back(ADDRESS_HOME_STATE);
-    suggested_fields->push_back(ADDRESS_HOME_ZIP);
-    suggested_fields->push_back(ADDRESS_HOME_SORTING_CODE);
-    suggested_fields->push_back(ADDRESS_HOME_COUNTRY);
-    minimal_fields_shown = suggested_fields->size();
-  }
-
+    const JavaParamRef<jobject>& unused_obj) {
   std::vector<base::string16> labels;
   AutofillProfile::CreateInferredLabels(
-      personal_data_manager_->GetProfiles(), suggested_fields.get(), NAME_FULL,
-      minimal_fields_shown, g_browser_process->GetApplicationLocale(), &labels);
+      personal_data_manager_->GetProfiles(), NULL, NAME_FULL, 2,
+      g_browser_process->GetApplicationLocale(), &labels);
 
   return base::android::ToJavaArrayOfStrings(env, labels);
 }
 
 jint PersonalDataManagerAndroid::GetCreditCardCount(
     JNIEnv* unused_env,
     const JavaParamRef<jobject>& unused_obj) {
   return personal_data_manager_->GetCreditCards().size();
 }
 
@@ skipping 126 matching lines @@
                base::android::ConvertJavaStringToUTF16(env, jcountry_name)));
 }
 
 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   PersonalDataManagerAndroid* personal_data_manager_android =
       new PersonalDataManagerAndroid(env, obj);
   return reinterpret_cast<intptr_t>(personal_data_manager_android);
 }
 
 }  // namespace autofill