[Merge M-53] [Payments] Add ability to bold parts of addresses

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 <algorithm>
 #include <memory>
 #include <utility>
@@ skipping 365 matching lines @@
   std::vector<ServerFieldType> label_fields;
   label_fields.push_back(COMPANY_NAME);
   label_fields.push_back(ADDRESS_HOME_LINE1);
   label_fields.push_back(ADDRESS_HOME_LINE2);
   label_fields.push_back(ADDRESS_HOME_DEPENDENT_LOCALITY);
   label_fields.push_back(ADDRESS_HOME_CITY);
   label_fields.push_back(ADDRESS_HOME_STATE);
   label_fields.push_back(ADDRESS_HOME_ZIP);
   label_fields.push_back(ADDRESS_HOME_SORTING_CODE);
   label_fields.push_back(ADDRESS_HOME_COUNTRY);
-  label_fields.push_back(PHONE_HOME_WHOLE_NUMBER);
 
   AutofillProfile profile;
   PopulateNativeProfileFromJava(jprofile, env, &profile);
 
   return ConvertUTF16ToJavaString(
       env, profile.ConstructInferredLabel(
                label_fields, label_fields.size(),
                g_browser_process->GetApplicationLocale()));
 }
 
@@ skipping 225 matching lines @@
     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);
-    suggested_fields->push_back(PHONE_HOME_WHOLE_NUMBER);
     minimal_fields_shown = suggested_fields->size();
   }
 
   std::vector<base::string16> labels;
   AutofillProfile::CreateInferredLabels(
       profiles, suggested_fields.get(), NAME_FULL, minimal_fields_shown,
       g_browser_process->GetApplicationLocale(), &labels);
 
   return base::android::ToJavaArrayOfStrings(env, labels);
 }
@@ skipping 42 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