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

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

 // Copyright 2016 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/profile_info_handler.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 127 matching lines @@
 ProfileInfoHandler::GetAccountNameAndIcon() const {
   std::string name;
   std::string icon_url;
 
 #if defined(OS_CHROMEOS)
   name = profile_->GetProfileUserName();
   if (name.empty()) {
     const user_manager::User* user =
         chromeos::ProfileHelper::Get()->GetUserByProfile(profile_);
     if (user && (user->GetType() != user_manager::USER_TYPE_GUEST))
-      name = user->email();
+      name = user->GetAccountId().GetUserEmail();
   }
   if (!name.empty())
     name = gaia::SanitizeEmail(gaia::CanonicalizeEmail(name));
 
   // Get image as data URL instead of using chrome://userimage source to avoid
   // issues with caching.
   const AccountId account_id(AccountId::FromUserEmail(name));
   scoped_refptr<base::RefCountedMemory> image =
       chromeos::options::UserImageSource::GetUserImage(account_id);
   icon_url = webui::GetPngDataUrl(image->front(), image->size());
@@ skipping 18 matching lines @@
   response->SetString("name", name);
   response->SetString("iconUrl", icon_url);
   return base::WrapUnique(response);
 }
 
 bool ProfileInfoHandler::IsProfileManagingSupervisedUsers() const {
   return !profile_->GetPrefs()->GetDictionary(prefs::kSupervisedUsers)->empty();
 }
 
 }  // namespace settings