Reland: PaymentRequest shipping address labels.

chrome/browser/autofill/android/personal_data_manager_android.cc

Index: chrome/browser/autofill/android/personal_data_manager_android.cc
diff --git a/chrome/browser/autofill/android/personal_data_manager_android.cc b/chrome/browser/autofill/android/personal_data_manager_android.cc
index 15ef6f0938f7f86e9b1ced18dfa9f37feb7d6a31..015b99fd71bf7f8c16eceb430fdc75b12415acf0 100644
--- a/chrome/browser/autofill/android/personal_data_manager_android.cc
+++ b/chrome/browser/autofill/android/personal_data_manager_android.cc
@@ -5,6 +5,7 @@
 #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"
@@ -338,11 +339,28 @@ ScopedJavaLocalRef<jstring> PersonalDataManagerAndroid::SetProfile(
 
 ScopedJavaLocalRef<jobjectArray> PersonalDataManagerAndroid::GetProfileLabels(
     JNIEnv* env,
-    const JavaParamRef<jobject>& unused_obj) {
+    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();
+  }
+
   std::vector<base::string16> labels;
   AutofillProfile::CreateInferredLabels(
-      personal_data_manager_->GetProfiles(), NULL, NAME_FULL, 2,
-      g_browser_process->GetApplicationLocale(), &labels);
+      personal_data_manager_->GetProfiles(), suggested_fields.get(), NAME_FULL,
+      minimal_fields_shown, g_browser_process->GetApplicationLocale(), &labels);
 
   return base::android::ToJavaArrayOfStrings(env, labels);
 }