Remove calls to User::email() from chrome/browser/ui/webui/*

chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

 // Copyright 2015 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/ui/webui/settings/md_settings_localized_strings_provider.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/i18n/number_formatting.h"
@@ skipping 872 matching lines @@
       base::ASCIIToUTF16(chrome::kLanguageSettingsLearnMoreUrl));
 }
 
 #if defined(OS_CHROMEOS)
 void AddMultiProfilesStrings(content::WebUIDataSource* html_source,
                              Profile* profile) {
   user_manager::UserManager* user_manager = user_manager::UserManager::Get();
 
   const user_manager::User* user =
       chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
-  std::string primary_user_email = user_manager->GetPrimaryUser()->email();
-  html_source->AddString("primaryUserEmail", primary_user_email);
-  html_source->AddBoolean("isSecondaryUser",
-                          user && user->email() != primary_user_email);
+  const user_manager::User* primary_user = user_manager->GetPrimaryUser();
+  html_source->AddString("primaryUserEmail",
+                         primary_user->GetAccountId().GetUserEmail());
+  html_source->AddBoolean(
+      "isSecondaryUser",
+      user && user->GetAccountId() != primary_user->GetAccountId());
 }
 #endif
 
 void AddOnStartupStrings(content::WebUIDataSource* html_source) {
   LocalizedString localized_strings[] = {
       {"onStartup", IDS_SETTINGS_ON_STARTUP},
       {"onStartupOpenNewTab", IDS_SETTINGS_ON_STARTUP_OPEN_NEW_TAB},
       {"onStartupContinue", IDS_SETTINGS_ON_STARTUP_CONTINUE},
       {"onStartupOpenSpecific", IDS_SETTINGS_ON_STARTUP_OPEN_SPECIFIC},
       {"onStartupUseCurrent", IDS_SETTINGS_ON_STARTUP_USE_CURRENT},
@@ skipping 860 matching lines @@
 #endif
   AddUsersStrings(html_source);
   AddWebContentStrings(html_source);
 
   policy_indicator::AddLocalizedStrings(html_source);
 
   html_source->SetJsonPath(kLocalizedStringsFile);
 }
 
 }  // namespace settings