This CL replaces e-mail with AccountId in wallpaper manager code.

chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc

 // Copyright 2014 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/chromeos/login/users/chrome_user_manager_impl.h"
 
 #include <cstddef>
 #include <set>
 
 #include "ash/multi_profile_uma.h"
@@ skipping 420 matching lines @@
       }
       break;
     }
     default:
       NOTREACHED();
   }
 }
 
 void ChromeUserManagerImpl::OnExternalDataSet(const std::string& policy,
                                               const std::string& user_id) {
+  const AccountId account_id =
+      user_manager::UserManager::Get()->GetKnownUserAccountId(user_id,
+                                                              std::string());
   if (policy == policy::key::kUserAvatarImage)
-    GetUserImageManager(AccountId::FromUserEmail(user_id))
-        ->OnExternalDataSet(policy);
+    GetUserImageManager(account_id)->OnExternalDataSet(policy);
   else if (policy == policy::key::kWallpaperImage)
-    WallpaperManager::Get()->OnPolicySet(policy, user_id);
+    WallpaperManager::Get()->OnPolicySet(policy, account_id);
   else
     NOTREACHED();
 }
 
 void ChromeUserManagerImpl::OnExternalDataCleared(const std::string& policy,
                                                   const std::string& user_id) {
+  const AccountId account_id =
+      user_manager::UserManager::Get()->GetKnownUserAccountId(user_id,
+                                                              std::string());
   if (policy == policy::key::kUserAvatarImage)
-    GetUserImageManager(AccountId::FromUserEmail(user_id))
-        ->OnExternalDataCleared(policy);
+    GetUserImageManager(account_id)->OnExternalDataCleared(policy);
   else if (policy == policy::key::kWallpaperImage)
-    WallpaperManager::Get()->OnPolicyCleared(policy, user_id);
+    WallpaperManager::Get()->OnPolicyCleared(policy, account_id);
   else
     NOTREACHED();
 }
 
 void ChromeUserManagerImpl::OnExternalDataFetched(
     const std::string& policy,
     const std::string& user_id,
     scoped_ptr<std::string> data) {
+  const AccountId account_id =
+      user_manager::UserManager::Get()->GetKnownUserAccountId(user_id,
+                                                              std::string());
   if (policy == policy::key::kUserAvatarImage)
-    GetUserImageManager(AccountId::FromUserEmail(user_id))
-        ->OnExternalDataFetched(policy, data.Pass());
+    GetUserImageManager(account_id)->OnExternalDataFetched(policy, data.Pass());
   else if (policy == policy::key::kWallpaperImage)
-    WallpaperManager::Get()->OnPolicyFetched(policy, user_id, data.Pass());
+    WallpaperManager::Get()->OnPolicyFetched(policy, account_id, data.Pass());
   else
     NOTREACHED();
 }
 
 void ChromeUserManagerImpl::OnPolicyUpdated(const std::string& user_id) {
-  const user_manager::User* user = FindUser(AccountId::FromUserEmail(user_id));
+  const AccountId account_id =
+      user_manager::UserManager::Get()->GetKnownUserAccountId(user_id,
+                                                              std::string());
+  const user_manager::User* user = FindUser(account_id);
   if (!user || user->GetType() != user_manager::USER_TYPE_PUBLIC_ACCOUNT)
     return;
   UpdatePublicAccountDisplayName(user_id);
 }
 
 void ChromeUserManagerImpl::OnDeviceLocalAccountsChanged() {
   // No action needed here, changes to the list of device-local accounts get
   // handled via the kAccountsPrefDeviceLocalAccounts device setting observer.
 }
 
@@ skipping 165 matching lines @@
   // mount point. Legacy (--login-profile) value will be used for now.
   // http://crosbug.com/230859
   active_user_->SetStubImage(
       user_manager::UserImage(
           *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
               IDR_PROFILE_PICTURE_LOADING)),
       user_manager::User::USER_IMAGE_INVALID,
       false);
 
   // Initializes wallpaper after active_user_ is set.
-  WallpaperManager::Get()->SetUserWallpaperNow(
-      login::GuestAccountId().GetUserEmail());
+  WallpaperManager::Get()->SetUserWallpaperNow(login::GuestAccountId());
 }
 
 void ChromeUserManagerImpl::RegularUserLoggedIn(const AccountId& account_id) {
   ChromeUserManager::RegularUserLoggedIn(account_id);
 
   if (FakeOwnership()) {
     const AccountId owner_account_id = GetActiveUser()->GetAccountId();
     VLOG(1) << "Set device owner to: " << owner_account_id.GetUserEmail();
     CrosSettings::Get()->SetString(kDeviceOwner,
                                    owner_account_id.GetUserEmail());
     SetOwnerId(owner_account_id);
   }
 
   if (IsCurrentUserNew())
-    WallpaperManager::Get()->SetUserWallpaperNow(account_id.GetUserEmail());
+    WallpaperManager::Get()->SetUserWallpaperNow(account_id);
 
   GetUserImageManager(account_id)->UserLoggedIn(IsCurrentUserNew(), false);
 
   WallpaperManager::Get()->EnsureLoggedInUserWallpaperLoaded();
 
   // Make sure that new data is persisted to Local State.
   GetLocalState()->CommitPendingWrite();
 }
 
 void ChromeUserManagerImpl::RegularUserLoggedInAsEphemeral(
     const AccountId& account_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   ChromeUserManager::RegularUserLoggedInAsEphemeral(account_id);
 
   GetUserImageManager(account_id)->UserLoggedIn(IsCurrentUserNew(), false);
-  WallpaperManager::Get()->SetUserWallpaperNow(account_id.GetUserEmail());
+  WallpaperManager::Get()->SetUserWallpaperNow(account_id);
 }
 
 void ChromeUserManagerImpl::SupervisedUserLoggedIn(
     const AccountId& account_id) {
   // TODO(nkostylev): Refactor, share code with RegularUserLoggedIn().
 
   // Remove the user from the user list.
   active_user_ = RemoveRegularOrSupervisedUserFromList(account_id);
 
   // If the user was not found on the user list, create a new user.
   if (!GetActiveUser()) {
     SetIsCurrentUserNew(true);
     active_user_ = user_manager::User::CreateSupervisedUser(account_id);
     // Leaving OAuth token status at the default state = unknown.
-    WallpaperManager::Get()->SetUserWallpaperNow(account_id.GetUserEmail());
+    WallpaperManager::Get()->SetUserWallpaperNow(account_id);
   } else {
     if (supervised_user_manager_->CheckForFirstRun(account_id.GetUserEmail())) {
       SetIsCurrentUserNew(true);
-      WallpaperManager::Get()->SetUserWallpaperNow(account_id.GetUserEmail());
+      WallpaperManager::Get()->SetUserWallpaperNow(account_id);
     } else {
       SetIsCurrentUserNew(false);
     }
   }
 
   // Add the user to the front of the user list.
   ListPrefUpdate prefs_users_update(GetLocalState(), kRegularUsers);
   prefs_users_update->Insert(0,
                              new base::StringValue(account_id.GetUserEmail()));
   users_.insert(users_.begin(), active_user_);
@@ skipping 38 matching lines @@
             device_local_account_type);
 
   active_user_ = user_manager::User::CreateKioskAppUser(kiosk_app_account_id);
   active_user_->SetStubImage(
       user_manager::UserImage(
           *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
               IDR_PROFILE_PICTURE_LOADING)),
       user_manager::User::USER_IMAGE_INVALID,
       false);
 
-  WallpaperManager::Get()->SetUserWallpaperNow(
-      kiosk_app_account_id.GetUserEmail());
+  WallpaperManager::Get()->SetUserWallpaperNow(kiosk_app_account_id);
 
   // TODO(bartfab): Add KioskAppUsers to the users_ list and keep metadata like
   // the kiosk_app_id in these objects, removing the need to re-parse the
   // device-local account list here to extract the kiosk_app_id.
   const std::vector<policy::DeviceLocalAccount> device_local_accounts =
       policy::GetDeviceLocalAccounts(cros_settings_);
   const policy::DeviceLocalAccount* account = NULL;
   for (std::vector<policy::DeviceLocalAccount>::const_iterator it =
            device_local_accounts.begin();
        it != device_local_accounts.end();
@@ skipping 23 matching lines @@
 
 void ChromeUserManagerImpl::DemoAccountLoggedIn() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   active_user_ = user_manager::User::CreateKioskAppUser(login::DemoAccountId());
   active_user_->SetStubImage(
       user_manager::UserImage(
           *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
               IDR_PROFILE_PICTURE_LOADING)),
       user_manager::User::USER_IMAGE_INVALID,
       false);
-  WallpaperManager::Get()->SetUserWallpaperNow(
-      login::DemoAccountId().GetUserEmail());
+  WallpaperManager::Get()->SetUserWallpaperNow(login::DemoAccountId());
 
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   command_line->AppendSwitch(::switches::kForceAppMode);
   command_line->AppendSwitchASCII(::switches::kAppId,
                                   DemoAppLauncher::kDemoAppId);
 
   // Disable window animation since the demo app runs in a single full screen
   // window and window animation causes start-up janks.
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       wm::switches::kWindowAnimationsDisabled);
@@ skipping 22 matching lines @@
       FakeOwnership() || DeviceSettingsService::Get()->HasPrivateOwnerKey();
   VLOG(1) << "Current user " << (is_owner ? "is owner" : "is not owner");
 
   SetCurrentUserIsOwner(is_owner);
 }
 
 void ChromeUserManagerImpl::RemoveNonCryptohomeData(
     const AccountId& account_id) {
   ChromeUserManager::RemoveNonCryptohomeData(account_id);
 
-  WallpaperManager::Get()->RemoveUserWallpaperInfo(account_id.GetUserEmail());
+  WallpaperManager::Get()->RemoveUserWallpaperInfo(account_id);
   GetUserImageManager(account_id)->DeleteUserImage();
 
   supervised_user_manager_->RemoveNonCryptohomeData(account_id.GetUserEmail());
 
   multi_profile_user_controller_->RemoveCachedValues(account_id.GetUserEmail());
 
   EasyUnlockService::ResetLocalStateForUser(account_id.GetUserEmail());
 }
 
 void
@@ skipping 315 matching lines @@
       new base::StringValue(account_id.GetUserEmail()));
 }
 
 void ChromeUserManagerImpl::RemoveReportingUser(const AccountId& account_id) {
   ListPrefUpdate users_update(GetLocalState(), kReportingUsers);
   users_update->Remove(
       base::StringValue(FullyCanonicalize(account_id.GetUserEmail())), NULL);
 }
 
 }  // namespace chromeos