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

chrome/browser/ui/webui/policy_ui_handler.cc

 // Copyright (c) 2012 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/policy_ui_handler.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 273 matching lines @@
  public:
   DeviceLocalAccountPolicyStatusProvider(
       const std::string& user_id,
       policy::DeviceLocalAccountPolicyService* service);
   ~DeviceLocalAccountPolicyStatusProvider() override;
 
   // CloudPolicyStatusProvider implementation.
   void GetStatus(base::DictionaryValue* dict) override;
 
   // policy::DeviceLocalAccountPolicyService::Observer implementation.
   void OnPolicyUpdated(const std::string& user_id) override;

[stevenjb, 2016/11/03 22:52:35]

Is there an issue tracking migration of the policy code to use AccountId? It
seems like something that should be updated (and AccountId should be used here)
but if we replace all of these calls to GetAccountId().GetUserEmail() we might
miss it?

[Alexander Alekseev, 2016/11/03 22:55:23]

This is the same issue. I am going to implement it in (near) future.

   void OnDeviceLocalAccountsChanged() override;
 
  private:
   const std::string user_id_;
   policy::DeviceLocalAccountPolicyService* service_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceLocalAccountPolicyStatusProvider);
 };
 #endif
 
@@ skipping 164 matching lines @@
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
   if (connector->IsEnterpriseManaged())
     device_status_provider_.reset(new DevicePolicyStatusProvider(connector));
 
   const user_manager::UserManager* user_manager =
       user_manager::UserManager::Get();
   if (user_manager->IsLoggedInAsPublicAccount()) {
     policy::DeviceLocalAccountPolicyService* local_account_service =
         connector->GetDeviceLocalAccountPolicyService();
     if (local_account_service) {
-      user_status_provider_.reset(
-          new DeviceLocalAccountPolicyStatusProvider(
-              user_manager->GetLoggedInUser()->email(), local_account_service));
+      user_status_provider_.reset(new DeviceLocalAccountPolicyStatusProvider(
+          user_manager->GetLoggedInUser()->GetAccountId().GetUserEmail(),
+          local_account_service));
     }
   } else {
     policy::UserCloudPolicyManagerChromeOS* user_cloud_policy_manager =
         policy::UserCloudPolicyManagerFactoryChromeOS::GetForProfile(
             Profile::FromWebUI(web_ui()));
     if (user_cloud_policy_manager) {
       user_status_provider_.reset(
           new UserPolicyStatusProvider(user_cloud_policy_manager->core()));
     }
   }
@@ skipping 251 matching lines @@
 }
 
 void PolicyUIHandler::OnRefreshPoliciesDone() const {
   web_ui()->CallJavascriptFunctionUnsafe("policy.Page.reloadPoliciesDone");
 }
 
 policy::PolicyService* PolicyUIHandler::GetPolicyService() const {
   return policy::ProfilePolicyConnectorFactory::GetForBrowserContext(
              web_ui()->GetWebContents()->GetBrowserContext())->policy_service();
 }