[Merge] User Person/People instead of User/Users everywhere profile related.

chrome/browser/ui/webui/options/browser_options_handler.cc

Index: chrome/browser/ui/webui/options/browser_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index ee5519ad07b9c94aa138c10fa90100fda283ffc5..4d4a848d87b9bfaa156f4caeadd93984541064d4 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -193,8 +193,6 @@ BrowserOptionsHandler::~BrowserOptionsHandler() {
 void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
   DCHECK(values);
 
-  const bool using_new_profiles_ui = switches::IsNewAvatarMenu();
-
 #if defined(OS_CHROMEOS)
   const int device_type_resource_id = chromeos::GetChromeDeviceTypeResourceId();
 #else
@@ -295,15 +293,9 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
       IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON },
     { "profileAddPersonEnable", IDS_PROFILE_ADD_PERSON_ENABLE },
     { "profileBrowserGuestEnable", IDS_PROFILE_BROWSER_GUEST_ENABLE },
-    { "profilesCreate", using_new_profiles_ui ?
-          IDS_NEW_PROFILES_CREATE_BUTTON_LABEL :
-          IDS_PROFILES_CREATE_BUTTON_LABEL },
-    { "profilesDelete", using_new_profiles_ui ?
-          IDS_NEW_PROFILES_DELETE_BUTTON_LABEL :
-          IDS_PROFILES_DELETE_BUTTON_LABEL },
-    { "profilesDeleteSingle", using_new_profiles_ui ?
-          IDS_NEW_PROFILES_DELETE_SINGLE_BUTTON_LABEL :
-          IDS_PROFILES_DELETE_SINGLE_BUTTON_LABEL },
+    { "profilesCreate", IDS_NEW_PROFILES_CREATE_BUTTON_LABEL },
+    { "profilesDelete", IDS_NEW_PROFILES_DELETE_BUTTON_LABEL },
+    { "profilesDeleteSingle", IDS_NEW_PROFILES_DELETE_SINGLE_BUTTON_LABEL },
     { "profilesListItemCurrent", IDS_PROFILES_LIST_ITEM_CURRENT },
     { "profilesManage", IDS_PROFILES_MANAGE_BUTTON_LABEL },
     { "profilesSupervisedDashboardTip",
@@ -325,9 +317,7 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
       IDS_OPTIONS_SAFEBROWSING_ENABLE_EXTENDED_REPORTING },
     { "sectionTitleAppearance", IDS_APPEARANCE_GROUP_NAME },
     { "sectionTitleDefaultBrowser", IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME },
-    { "sectionTitleUsers", using_new_profiles_ui ?
-          IDS_NEW_PROFILES_OPTIONS_GROUP_NAME :
-          IDS_PROFILES_OPTIONS_GROUP_NAME },
+    { "sectionTitleUsers", IDS_NEW_PROFILES_OPTIONS_GROUP_NAME },
     { "sectionTitleProxy", IDS_OPTIONS_PROXY_GROUP_NAME },
     { "sectionTitleSearch", IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME },
     { "sectionTitleStartup", IDS_OPTIONS_STARTUP_GROUP_NAME },
@@ -647,7 +637,7 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
                      CommandLine::ForCurrentProcess()->HasSwitch(
                          switches::kEnableWebsiteSettingsManager));
 
-  values->SetBoolean("usingNewProfilesUI", using_new_profiles_ui);
+  values->SetBoolean("usingNewProfilesUI", switches::IsNewAvatarMenu());
 }
 
 #if defined(ENABLE_FULL_PRINTING)