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

chrome/browser/chromeos/extensions/wallpaper_private_api.cc

 // Copyright (c) 2013 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/extensions/wallpaper_private_api.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 330 matching lines @@
 WallpaperPrivateSetWallpaperIfExistsFunction::
     WallpaperPrivateSetWallpaperIfExistsFunction() {}
 
 WallpaperPrivateSetWallpaperIfExistsFunction::
     ~WallpaperPrivateSetWallpaperIfExistsFunction() {}
 
 bool WallpaperPrivateSetWallpaperIfExistsFunction::RunAsync() {
   params = set_wallpaper_if_exists::Params::Create(*args_);
   EXTENSION_FUNCTION_VALIDATE(params);
 
-  // Gets email address from caller, ensuring multiprofile compatibility.
+  // Gets account id from the caller, ensuring multiprofile compatibility.
   const user_manager::User* user = GetUserFromBrowserContext(browser_context());
-  user_id_ = user->email();
+  account_id_ = user->GetAccountId();
 
   base::FilePath wallpaper_path;
   base::FilePath fallback_path;
   chromeos::WallpaperManager::WallpaperResolution resolution =
       chromeos::WallpaperManager::Get()->GetAppropriateResolution();
 
   std::string file_name = GURL(params->url).ExtractFileName();
   CHECK(PathService::Get(chrome::DIR_CHROMEOS_WALLPAPERS,
                          &wallpaper_path));
   fallback_path = wallpaper_path.Append(file_name);
@@ skipping 52 matching lines @@
     const gfx::ImageSkia& image) {
   // Set unsafe_wallpaper_decoder_ to null since the decoding already finished.
   unsafe_wallpaper_decoder_ = NULL;
 
   chromeos::WallpaperManager* wallpaper_manager =
       chromeos::WallpaperManager::Get();
   wallpaper::WallpaperLayout layout = wallpaper_api_util::GetLayoutEnum(
       wallpaper_base::ToString(params->layout));
 
   bool update_wallpaper =
-      user_id_ == user_manager::UserManager::Get()->GetActiveUser()->email();
-  wallpaper_manager->SetWallpaperFromImageSkia(
-      user_id_, image, layout, update_wallpaper);
+      account_id_ ==
+      user_manager::UserManager::Get()->GetActiveUser()->GetAccountId();
+  wallpaper_manager->SetWallpaperFromImageSkia(account_id_, image, layout,
+                                               update_wallpaper);
   bool is_persistent = !user_manager::UserManager::Get()
                             ->IsCurrentUserNonCryptohomeDataEphemeral();
   wallpaper::WallpaperInfo info = {params->url,
                                    layout,
                                    user_manager::User::ONLINE,
                                    base::Time::Now().LocalMidnight()};
-  wallpaper_manager->SetUserWallpaperInfo(user_id_, info, is_persistent);
+  wallpaper_manager->SetUserWallpaperInfo(account_id_, info, is_persistent);
   SetResult(new base::FundamentalValue(true));
   Profile* profile = Profile::FromBrowserContext(browser_context());
   // This API is only available to the component wallpaper picker. We do not
   // need to show the app's name if it is the component wallpaper picker. So set
   // the pref to empty string.
   profile->GetPrefs()->SetString(prefs::kCurrentWallpaperAppName,
                                  std::string());
   SendResponse(true);
 }
 
 void WallpaperPrivateSetWallpaperIfExistsFunction::OnFileNotExists(
     const std::string& error) {
   SetResult(new base::FundamentalValue(false));
   OnFailure(error);
 }
 
 WallpaperPrivateSetWallpaperFunction::WallpaperPrivateSetWallpaperFunction() {
 }
 
 WallpaperPrivateSetWallpaperFunction::~WallpaperPrivateSetWallpaperFunction() {
 }
 
 bool WallpaperPrivateSetWallpaperFunction::RunAsync() {
   params = set_wallpaper::Params::Create(*args_);
   EXTENSION_FUNCTION_VALIDATE(params);
 
-  // Gets email address from caller, ensuring multiprofile compatibility.
+  // Gets account id from the caller, ensuring multiprofile compatibility.
   const user_manager::User* user = GetUserFromBrowserContext(browser_context());
-  user_id_ = user->email();
+  account_id_ = user->GetAccountId();
 
   StartDecode(params->wallpaper);
 
   return true;
 }
 
 void WallpaperPrivateSetWallpaperFunction::OnWallpaperDecoded(
     const gfx::ImageSkia& image) {
   wallpaper_ = image;
   // Set unsafe_wallpaper_decoder_ to null since the decoding already finished.
@@ skipping 51 matching lines @@
 
 void WallpaperPrivateSetWallpaperFunction::SetDecodedWallpaper(
     scoped_ptr<gfx::ImageSkia> image) {
   chromeos::WallpaperManager* wallpaper_manager =
       chromeos::WallpaperManager::Get();
 
   wallpaper::WallpaperLayout layout = wallpaper_api_util::GetLayoutEnum(
       wallpaper_base::ToString(params->layout));
 
   bool update_wallpaper =
-      user_id_ == user_manager::UserManager::Get()->GetActiveUser()->email();
-  wallpaper_manager->SetWallpaperFromImageSkia(
-      user_id_, *image.get(), layout, update_wallpaper);
+      account_id_ ==
+      user_manager::UserManager::Get()->GetActiveUser()->GetAccountId();
+  wallpaper_manager->SetWallpaperFromImageSkia(account_id_, *image.get(),
+                                               layout, update_wallpaper);
 
   bool is_persistent = !user_manager::UserManager::Get()
                             ->IsCurrentUserNonCryptohomeDataEphemeral();
   wallpaper::WallpaperInfo info = {params->url,
                                    layout,
                                    user_manager::User::ONLINE,
                                    base::Time::Now().LocalMidnight()};
   Profile* profile = Profile::FromBrowserContext(browser_context());
   // This API is only available to the component wallpaper picker. We do not
   // need to show the app's name if it is the component wallpaper picker. So set
   // the pref to empty string.
   profile->GetPrefs()->SetString(prefs::kCurrentWallpaperAppName,
                                  std::string());
-  wallpaper_manager->SetUserWallpaperInfo(user_id_, info, is_persistent);
+  wallpaper_manager->SetUserWallpaperInfo(account_id_, info, is_persistent);
   SendResponse(true);
 }
 
 WallpaperPrivateResetWallpaperFunction::
     WallpaperPrivateResetWallpaperFunction() {}
 
 WallpaperPrivateResetWallpaperFunction::
     ~WallpaperPrivateResetWallpaperFunction() {}
 
 bool WallpaperPrivateResetWallpaperFunction::RunAsync() {
   chromeos::WallpaperManager* wallpaper_manager =
       chromeos::WallpaperManager::Get();
   user_manager::UserManager* user_manager = user_manager::UserManager::Get();
 
-  std::string user_id = user_manager->GetActiveUser()->email();
-  wallpaper_manager->RemoveUserWallpaperInfo(user_id);
+  const AccountId& account_id = user_manager->GetActiveUser()->GetAccountId();
+  wallpaper_manager->RemoveUserWallpaperInfo(account_id);
 
   wallpaper::WallpaperInfo info = {std::string(),
                                    wallpaper::WALLPAPER_LAYOUT_CENTER,
                                    user_manager::User::DEFAULT,
                                    base::Time::Now().LocalMidnight()};
   bool is_persistent =
       !user_manager->IsCurrentUserNonCryptohomeDataEphemeral();
-  wallpaper_manager->SetUserWallpaperInfo(user_id, info, is_persistent);
+  wallpaper_manager->SetUserWallpaperInfo(account_id, info, is_persistent);
 
-  wallpaper_manager->SetDefaultWallpaperNow(user_id);
+  wallpaper_manager->SetDefaultWallpaperNow(account_id);
   Profile* profile = Profile::FromBrowserContext(browser_context());
   // This API is only available to the component wallpaper picker. We do not
   // need to show the app's name if it is the component wallpaper picker. So set
   // the pref to empty string.
   profile->GetPrefs()->SetString(prefs::kCurrentWallpaperAppName,
                                  std::string());
   return true;
 }
 
 WallpaperPrivateSetCustomWallpaperFunction::
     WallpaperPrivateSetCustomWallpaperFunction() {}
 
 WallpaperPrivateSetCustomWallpaperFunction::
     ~WallpaperPrivateSetCustomWallpaperFunction() {}
 
 bool WallpaperPrivateSetCustomWallpaperFunction::RunAsync() {
   params = set_custom_wallpaper::Params::Create(*args_);
   EXTENSION_FUNCTION_VALIDATE(params);
 
-  // Gets email address from caller, ensuring multiprofile compatibility.
+  // Gets account id from the caller, ensuring multiprofile compatibility.
   const user_manager::User* user = GetUserFromBrowserContext(browser_context());
-  user_id_ = user->email();
+  account_id_ = user->GetAccountId();
   user_id_hash_ = user->username_hash();
 
   StartDecode(params->wallpaper);
 
   return true;
 }
 
 void WallpaperPrivateSetCustomWallpaperFunction::OnWallpaperDecoded(
     const gfx::ImageSkia& image) {
   chromeos::WallpaperManager* wallpaper_manager =
       chromeos::WallpaperManager::Get();
   base::FilePath thumbnail_path = wallpaper_manager->GetCustomWallpaperPath(
       wallpaper::kThumbnailWallpaperSubDir, user_id_hash_, params->file_name);
 
   sequence_token_ = BrowserThread::GetBlockingPool()->GetNamedSequenceToken(
       wallpaper::kWallpaperSequenceTokenName);
   scoped_refptr<base::SequencedTaskRunner> task_runner =
       BrowserThread::GetBlockingPool()->
           GetSequencedTaskRunnerWithShutdownBehavior(sequence_token_,
               base::SequencedWorkerPool::BLOCK_SHUTDOWN);
 
   wallpaper::WallpaperLayout layout = wallpaper_api_util::GetLayoutEnum(
       wallpaper_base::ToString(params->layout));
   wallpaper_api_util::RecordCustomWallpaperLayout(layout);
 
   bool update_wallpaper =
-      user_id_ == user_manager::UserManager::Get()->GetActiveUser()->email();
-  wallpaper_manager->SetCustomWallpaper(user_id_,
-                                        user_id_hash_,
-                                        params->file_name,
-                                        layout,
-                                        user_manager::User::CUSTOMIZED,
-                                        image,
-                                        update_wallpaper);
+      account_id_ ==
+      user_manager::UserManager::Get()->GetActiveUser()->GetAccountId();
+  wallpaper_manager->SetCustomWallpaper(
+      account_id_, user_id_hash_, params->file_name, layout,
+      user_manager::User::CUSTOMIZED, image, update_wallpaper);
   unsafe_wallpaper_decoder_ = NULL;
 
   Profile* profile = Profile::FromBrowserContext(browser_context());
   // This API is only available to the component wallpaper picker. We do not
   // need to show the app's name if it is the component wallpaper picker. So set
   // the pref to empty string.
   profile->GetPrefs()->SetString(prefs::kCurrentWallpaperAppName,
                                  std::string());
 
   if (params->generate_thumbnail) {
@@ skipping 54 matching lines @@
   wallpaper_manager->GetLoggedInUserWallpaperInfo(&info);
   if (info.type != user_manager::User::CUSTOMIZED) {
     SetError("Only custom wallpaper can change layout.");
     SendResponse(false);
     return false;
   }
   info.layout = wallpaper_api_util::GetLayoutEnum(
       wallpaper_base::ToString(params->layout));
   wallpaper_api_util::RecordCustomWallpaperLayout(info.layout);
 
-  std::string email =
-      user_manager::UserManager::Get()->GetActiveUser()->email();
+  const AccountId& account_id =
+      user_manager::UserManager::Get()->GetActiveUser()->GetAccountId();
   bool is_persistent = !user_manager::UserManager::Get()
                             ->IsCurrentUserNonCryptohomeDataEphemeral();
-  wallpaper_manager->SetUserWallpaperInfo(email, info, is_persistent);
+  wallpaper_manager->SetUserWallpaperInfo(account_id, info, is_persistent);
   wallpaper_manager->UpdateWallpaper(false /* clear_cache */);
   SendResponse(true);
 
-  // Gets email address while at UI thread.
   return true;
 }
 
 WallpaperPrivateMinimizeInactiveWindowsFunction::
     WallpaperPrivateMinimizeInactiveWindowsFunction() {
 }
 
 WallpaperPrivateMinimizeInactiveWindowsFunction::
     ~WallpaperPrivateMinimizeInactiveWindowsFunction() {
 }
@@ skipping 23 matching lines @@
 
 WallpaperPrivateGetThumbnailFunction::~WallpaperPrivateGetThumbnailFunction() {
 }
 
 bool WallpaperPrivateGetThumbnailFunction::RunAsync() {
   scoped_ptr<get_thumbnail::Params> params(
       get_thumbnail::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
   base::FilePath thumbnail_path;
-  std::string email =
-      user_manager::UserManager::Get()->GetActiveUser()->email();
   if (params->source == wallpaper_private::WALLPAPER_SOURCE_ONLINE) {
     std::string file_name = GURL(params->url_or_file).ExtractFileName();
     CHECK(PathService::Get(chrome::DIR_CHROMEOS_WALLPAPER_THUMBNAILS,
                            &thumbnail_path));
     thumbnail_path = thumbnail_path.Append(file_name);
   } else {
     if (!IsOEMDefaultWallpaper()) {
       SetError("No OEM wallpaper.");
       SendResponse(false);
       return false;
@@ skipping 158 matching lines @@
                  this, file_list));
 }
 
 void WallpaperPrivateGetOfflineWallpaperListFunction::OnComplete(
     const std::vector<std::string>& file_list) {
   base::ListValue* results = new base::ListValue();
   results->AppendStrings(file_list);
   SetResult(results);
   SendResponse(true);
 }