We should use UserID object to identify users instead of username.

chrome/browser/ui/webui/policy_ui.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.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
@@ skipping 22 matching lines @@
 #include "components/policy/core/common/cloud/cloud_policy_store.h"
 #include "components/policy/core/common/cloud/cloud_policy_validator.h"
 #include "components/policy/core/common/policy_map.h"
 #include "components/policy/core/common/policy_namespace.h"
 #include "components/policy/core/common/policy_service.h"
 #include "components/policy/core/common/policy_types.h"
 #include "components/policy/core/common/remote_commands/remote_commands_service.h"
 #include "components/policy/core/common/schema.h"
 #include "components/policy/core/common/schema_map.h"
 #include "components/policy/core/common/schema_registry.h"
+#include "components/user_manager/user_id.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "grit/browser_resources.h"
 #include "grit/components_strings.h"
 #include "policy/policy_constants.h"
 #include "policy/proto/device_management_backend.pb.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 271 matching lines @@
 // associated with the device-local account specified by |user_id| at
 // construction time. The indirection via user ID and
 // DeviceLocalAccountPolicyService is necessary because the device-local account
 // may go away any time behind the scenes, at which point the status message
 // text will indicate CloudPolicyStore::STATUS_BAD_STATE.
 class DeviceLocalAccountPolicyStatusProvider
     : public CloudPolicyStatusProvider,
       public policy::DeviceLocalAccountPolicyService::Observer {
  public:
   DeviceLocalAccountPolicyStatusProvider(
-      const std::string& user_id,
+      const user_manager::UserID& 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;
+  void OnPolicyUpdated(const user_manager::UserID& user_id) override;
   void OnDeviceLocalAccountsChanged() override;
 
  private:
-  const std::string user_id_;
+  const user_manager::UserID user_id_;
   policy::DeviceLocalAccountPolicyService* service_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceLocalAccountPolicyStatusProvider);
 };
 #endif
 
 // The JavaScript message handler for the chrome://policy page.
 class PolicyUIHandler : public content::WebUIMessageHandler,
 #if defined(ENABLE_EXTENSIONS)
                         public extensions::ExtensionRegistryObserver,
@@ skipping 132 matching lines @@
 
 DevicePolicyStatusProvider::~DevicePolicyStatusProvider() {
 }
 
 void DevicePolicyStatusProvider::GetStatus(base::DictionaryValue* dict) {
   GetStatusFromCore(core_, dict);
   dict->SetString("domain", domain_);
 }
 
 DeviceLocalAccountPolicyStatusProvider::DeviceLocalAccountPolicyStatusProvider(
-    const std::string& user_id,
+    const user_manager::UserID& user_id,
     policy::DeviceLocalAccountPolicyService* service)
       : user_id_(user_id),
         service_(service) {
   service_->AddObserver(this);
 }
 
 DeviceLocalAccountPolicyStatusProvider::
     ~DeviceLocalAccountPolicyStatusProvider() {
   service_->RemoveObserver(this);
 }
@@ skipping 10 matching lines @@
                     policy::FormatStoreStatus(
                         policy::CloudPolicyStore::STATUS_BAD_STATE,
                         policy::CloudPolicyValidatorBase::VALIDATION_OK));
     dict->SetString("username", std::string());
   }
   ExtractDomainFromUsername(dict);
   dict->SetBoolean("publicAccount", true);
 }
 
 void DeviceLocalAccountPolicyStatusProvider::OnPolicyUpdated(
-    const std::string& user_id) {
+    const user_manager::UserID& user_id) {
   if (user_id == user_id_)
     NotifyStatusChange();
 }
 
 void DeviceLocalAccountPolicyStatusProvider::OnDeviceLocalAccountsChanged() {
   NotifyStatusChange();
 }
 #endif
 
 PolicyUIHandler::PolicyUIHandler()
@@ skipping 22 matching lines @@
     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_manager->GetLoggedInUser()->GetUserID(), 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 253 matching lines @@
 }
 
 PolicyUI::PolicyUI(content::WebUI* web_ui) : WebUIController(web_ui) {
   web_ui->AddMessageHandler(new PolicyUIHandler);
   content::WebUIDataSource::Add(Profile::FromWebUI(web_ui),
                                 CreatePolicyUIHTMLSource());
 }
 
 PolicyUI::~PolicyUI() {
 }