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

chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.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/wallpaper/wallpaper_manager.h"
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/desktop_background_controller_observer.h"
 #include "ash/desktop_background/desktop_background_controller_test_api.h"
 #include "ash/display/display_manager.h"
@@ skipping 46 matching lines @@
 
 const char kTestUser1[] = "test1@domain.com";
 const char kTestUser1Hash[] = "test1@domain.com-hash";
 const char kTestUser2[] = "test2@domain.com";
 const char kTestUser2Hash[] = "test2@domain.com-hash";
 
 }  // namespace
 
 class WallpaperManagerBrowserTest : public InProcessBrowserTest {
  public:
-  WallpaperManagerBrowserTest () : controller_(NULL),
-                                   local_state_(NULL) {
+  WallpaperManagerBrowserTest() : controller_(NULL),
+                                  local_state_(NULL) {
   }
 
   ~WallpaperManagerBrowserTest() override {}
 
   void SetUpOnMainThread() override {
     controller_ = ash::Shell::GetInstance()->desktop_background_controller();
     local_state_ = g_browser_process->local_state();
     ash::DesktopBackgroundController::TestAPI(controller_)
         .set_wallpaper_reload_delay_for_test(0);
     UpdateDisplay("800x600");
@@ skipping 47 matching lines @@
     user_manager::User* user =
         user_manager::UserManager::Get()->FindUserAndModify(account_id);
     user_manager::UserManager::Get()->ChangeUserChildStatus(
         user, true /* is_child */);
   }
 
   int LoadedWallpapers() {
     return WallpaperManager::Get()->loaded_wallpapers_for_test();
   }
 
-  void CacheUserWallpaper(const std::string& user) {
-    WallpaperManager::Get()->CacheUserWallpaper(user);
+  void CacheUserWallpaper(const AccountId& account_id) {
+    WallpaperManager::Get()->CacheUserWallpaper(account_id);
   }
 
   void ClearDisposableWallpaperCache() {
     WallpaperManager::Get()->ClearDisposableWallpaperCache();
   }
 
   // Initializes default wallpaper paths "*default_*file" and writes JPEG
   // wallpaper images to them.
   // Only needs to be called (once) by tests that want to test loading of
   // default wallpapers.
   void CreateCmdlineWallpapers() {
     wallpaper_dir_.reset(new base::ScopedTempDir);
     ASSERT_TRUE(wallpaper_dir_->CreateUniqueTempDir());
     wallpaper_manager_test_utils::CreateCmdlineWallpapers(
         *wallpaper_dir_, &wallpaper_manager_command_line_);
   }
 
   ash::DesktopBackgroundController* controller_;
   PrefService* local_state_;
   scoped_ptr<base::CommandLine> wallpaper_manager_command_line_;
 
   // Directory created by CreateCmdlineWallpapers () to store default
   // wallpaper images.
   scoped_ptr<base::ScopedTempDir> wallpaper_dir_;
 
+  const AccountId test_account_id1_ = AccountId::FromUserEmail(kTestUser1);
+  const AccountId test_account_id2_ = AccountId::FromUserEmail(kTestUser2);
+
  private:
   DISALLOW_COPY_AND_ASSIGN(WallpaperManagerBrowserTest);
 };
 
 // Tests that the appropriate custom wallpaper (large vs. small) is loaded
 // depending on the desktop resolution.
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest,
                        LoadCustomLargeWallpaperForLargeExternalScreen) {
   WallpaperManager* wallpaper_manager = WallpaperManager::Get();
-  LogIn(AccountId::FromUserEmail(kTestUser1), kTestUser1Hash);
+  LogIn(test_account_id1_, kTestUser1Hash);
   std::string id = base::Int64ToString(base::Time::Now().ToInternalValue());
   base::FilePath small_wallpaper_path = GetCustomWallpaperPath(
       wallpaper::kSmallWallpaperSubDir, kTestUser1Hash, id);
   base::FilePath large_wallpaper_path = GetCustomWallpaperPath(
       wallpaper::kLargeWallpaperSubDir, kTestUser1Hash, id);
 
   // Saves the small/large resolution wallpapers to small/large custom
   // wallpaper paths.
   ASSERT_TRUE(wallpaper_manager_test_utils::WriteJPEGFile(
       small_wallpaper_path,
       kSmallWallpaperWidth,
       kSmallWallpaperHeight,
       wallpaper_manager_test_utils::kSmallDefaultWallpaperColor));
   ASSERT_TRUE(wallpaper_manager_test_utils::WriteJPEGFile(
       large_wallpaper_path,
       kLargeWallpaperWidth,
       kLargeWallpaperHeight,
       wallpaper_manager_test_utils::kLargeDefaultWallpaperColor));
 
   std::string relative_path = base::FilePath(kTestUser1Hash).Append(id).value();
-  // Saves wallpaper info to local state for user |kTestUser1|.
+  // Saves wallpaper info to local state for user |test_account_id1_|.
   WallpaperInfo info = {relative_path, WALLPAPER_LAYOUT_CENTER_CROPPED,
                         user_manager::User::CUSTOMIZED,
                         base::Time::Now().LocalMidnight()};
-  wallpaper_manager->SetUserWallpaperInfo(kTestUser1, info, true);
+  wallpaper_manager->SetUserWallpaperInfo(test_account_id1_, info, true);
 
-  // Set the wallpaper for |kTestUser1|.
-  wallpaper_manager->SetUserWallpaperNow(kTestUser1);
+  // Set the wallpaper for |test_account_id1_|.
+  wallpaper_manager->SetUserWallpaperNow(test_account_id1_);
   wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
   gfx::ImageSkia wallpaper = controller_->GetWallpaper();
 
   // Display is initialized to 800x600. The small resolution custom wallpaper is
   // expected.
   EXPECT_EQ(kSmallWallpaperWidth, wallpaper.width());
   EXPECT_EQ(kSmallWallpaperHeight, wallpaper.height());
 
   // Hook up another 800x600 display. This shouldn't trigger a reload.
   UpdateDisplay("800x600,800x600");
@@ skipping 27 matching lines @@
   EXPECT_EQ(kLargeWallpaperHeight, wallpaper.height());
 }
 
 // If chrome tries to reload the same wallpaper twice, the latter request should
 // be prevented. Otherwise, there are some strange animation issues as
 // described in crbug.com/158383.
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest,
                        PreventReloadingSameWallpaper) {
   WallpaperManager* wallpaper_manager = WallpaperManager::Get();
   // New user log in, a default wallpaper is loaded.
-  LogIn(AccountId::FromUserEmail(kTestUser1), kTestUser1Hash);
+  LogIn(test_account_id1_, kTestUser1Hash);
   EXPECT_EQ(1, LoadedWallpapers());
   // Loads the same wallpaper before the initial one finished. It should be
   // prevented.
-  wallpaper_manager->SetUserWallpaperNow(kTestUser1);
+  wallpaper_manager->SetUserWallpaperNow(test_account_id1_);
   wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
   EXPECT_EQ(1, LoadedWallpapers());
   // Loads the same wallpaper after the initial one finished. It should be
   // prevented.
-  wallpaper_manager->SetUserWallpaperNow(kTestUser1);
+  wallpaper_manager->SetUserWallpaperNow(test_account_id1_);
   wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
   EXPECT_EQ(1, LoadedWallpapers());
   ClearDisposableWallpaperCache();
 
   // Change wallpaper to a custom wallpaper.
   std::string id = base::Int64ToString(base::Time::Now().ToInternalValue());
   base::FilePath small_wallpaper_path = GetCustomWallpaperPath(
       wallpaper::kSmallWallpaperSubDir, kTestUser1Hash, id);
   ASSERT_TRUE(wallpaper_manager_test_utils::WriteJPEGFile(
       small_wallpaper_path,
       kSmallWallpaperWidth,
       kSmallWallpaperHeight,
       wallpaper_manager_test_utils::kSmallDefaultWallpaperColor));
 
   std::string relative_path = base::FilePath(kTestUser1Hash).Append(id).value();
-  // Saves wallpaper info to local state for user |kTestUser1|.
+  // Saves wallpaper info to local state for user |test_account_id1_|.
   WallpaperInfo info = {relative_path, WALLPAPER_LAYOUT_CENTER_CROPPED,
                         user_manager::User::CUSTOMIZED,
                         base::Time::Now().LocalMidnight()};
-  wallpaper_manager->SetUserWallpaperInfo(kTestUser1, info, true);
+  wallpaper_manager->SetUserWallpaperInfo(test_account_id1_, info, true);
 
-  wallpaper_manager->SetUserWallpaperNow(kTestUser1);
+  wallpaper_manager->SetUserWallpaperNow(test_account_id1_);
   WaitAsyncWallpaperLoadStarted();
   EXPECT_EQ(2, LoadedWallpapers());
   // Loads the same wallpaper before the initial one finished. It should be
   // prevented.
-  wallpaper_manager->SetUserWallpaperNow(kTestUser1);
+  wallpaper_manager->SetUserWallpaperNow(test_account_id1_);
   WaitAsyncWallpaperLoadStarted();
   EXPECT_EQ(2, LoadedWallpapers());
-  wallpaper_manager->SetUserWallpaperNow(kTestUser1);
+  wallpaper_manager->SetUserWallpaperNow(test_account_id1_);
   wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
   EXPECT_EQ(2, LoadedWallpapers());
 }
 
 // Some users have old user profiles which may have legacy wallpapers. And these
 // lagacy wallpapers should migrate to new wallpaper picker version seamlessly.
 // This tests make sure we compatible with migrated old wallpapers.
 // crosbug.com/38429
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest,
                        PRE_UseMigratedWallpaperInfo) {
   // New user log in, a default wallpaper is loaded.
-  LogIn(AccountId::FromUserEmail(kTestUser1), kTestUser1Hash);
+  LogIn(test_account_id1_, kTestUser1Hash);
   // Old wallpaper migration code doesn't exist in codebase anymore. Modify user
   // wallpaper info directly to simulate the wallpaper migration. See
   // crosbug.com/38429 for details about why we modify wallpaper info this way.
   WallpaperInfo info = {"123", WALLPAPER_LAYOUT_CENTER_CROPPED,
                         user_manager::User::DEFAULT,
                         base::Time::Now().LocalMidnight()};
   base::FilePath user_data_dir;
   ASSERT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
   ASSERT_TRUE(wallpaper_manager_test_utils::WriteJPEGFile(
       user_data_dir.Append("123"),
       wallpaper_manager_test_utils::kWallpaperSize,
       wallpaper_manager_test_utils::kWallpaperSize,
       wallpaper_manager_test_utils::kLargeDefaultWallpaperColor));
-  WallpaperManager::Get()->SetUserWallpaperInfo(kTestUser1, info, true);
+  WallpaperManager::Get()->SetUserWallpaperInfo(test_account_id1_, info, true);
 }
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest,
                        UseMigratedWallpaperInfo) {
-  LogIn(AccountId::FromUserEmail(kTestUser1), kTestUser1Hash);
+  LogIn(test_account_id1_, kTestUser1Hash);
   wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
   // This test should finish normally. If timeout, it is probably because
   // migrated wallpaper is somehow not loaded. Bad things can happen if
   // wallpaper is not loaded at login screen. One example is: crosbug.com/38429.
 }
 
 // Some users have old user profiles which may never get a chance to migrate.
 // This tests make sure we compatible with these profiles.
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest,
                        PRE_UsePreMigrationWallpaperInfo) {
   // New user log in, a default wallpaper is loaded.
-  LogIn(AccountId::FromUserEmail(kTestUser1), kTestUser1Hash);
+  LogIn(test_account_id1_, kTestUser1Hash);
   // Old wallpaper migration code doesn't exist in codebase anymore. So if
   // user's profile is not migrated, it is the same as no wallpaper info. To
   // simulate this, we remove user's wallpaper info here.
-  WallpaperManager::Get()->RemoveUserWallpaperInfo(kTestUser1);
+  WallpaperManager::Get()->RemoveUserWallpaperInfo(test_account_id1_);
 }
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest,
                        UsePreMigrationWallpaperInfo) {
-  LogIn(AccountId::FromUserEmail(kTestUser1), kTestUser1Hash);
+  LogIn(test_account_id1_, kTestUser1Hash);
   wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
   // This test should finish normally. If timeout, it is probably because chrome
   // can not handle pre migrated user profile (M21 profile or older).
 }
 
 // Test for http://crbug.com/265689. When hooked up a large external monitor,
 // the default large resolution wallpaper should load.
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest,
                        HotPlugInScreenAtGAIALoginScreen) {
   UpdateDisplay("800x600");
   // Set initial wallpaper to the default wallpaper.
-  WallpaperManager::Get()->SetDefaultWallpaperNow(
-      login::StubAccountId().GetUserEmail());
+  WallpaperManager::Get()->SetDefaultWallpaperNow(login::StubAccountId());
   wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
 
   // Hook up a 2000x2000 display. The large resolution custom wallpaper should
   // be loaded.
   UpdateDisplay("800x600,2000x2000");
   wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
 }
 
 class WallpaperManagerBrowserTestNoAnimation
     : public WallpaperManagerBrowserTest {
  public:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitch(switches::kLoginManager);
     command_line->AppendSwitchASCII(switches::kLoginProfile, "user");
     command_line->AppendSwitch(chromeos::switches::kDisableLoginAnimations);
     command_line->AppendSwitch(chromeos::switches::kDisableBootAnimation);
   }
 };
 
 // Same test as WallpaperManagerBrowserTest.UseMigratedWallpaperInfo. But
 // disabled boot and login animation.
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestNoAnimation,
                        PRE_UseMigratedWallpaperInfo) {
   // New user log in, a default wallpaper is loaded.
-  LogIn(AccountId::FromUserEmail(kTestUser1), kTestUser1Hash);
+  LogIn(test_account_id1_, kTestUser1Hash);
   // Old wallpaper migration code doesn't exist in codebase anymore. Modify user
   // wallpaper info directly to simulate the wallpaper migration. See
   // crosbug.com/38429 for details about why we modify wallpaper info this way.
   WallpaperInfo info = {"123", WALLPAPER_LAYOUT_CENTER_CROPPED,
                         user_manager::User::DEFAULT,
                         base::Time::Now().LocalMidnight()};
   base::FilePath user_data_dir;
   ASSERT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
   ASSERT_TRUE(wallpaper_manager_test_utils::WriteJPEGFile(
       user_data_dir.Append("123"),
       wallpaper_manager_test_utils::kWallpaperSize,
       wallpaper_manager_test_utils::kWallpaperSize,
       wallpaper_manager_test_utils::kLargeDefaultWallpaperColor));
-  WallpaperManager::Get()->SetUserWallpaperInfo(kTestUser1, info, true);
+  WallpaperManager::Get()->SetUserWallpaperInfo(test_account_id1_, info, true);
 }
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestNoAnimation,
                        UseMigratedWallpaperInfo) {
-  LogIn(AccountId::FromUserEmail(kTestUser1), kTestUser1Hash);
+  LogIn(test_account_id1_, kTestUser1Hash);
   wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
   // This test should finish normally. If timeout, it is probably because
   // migrated wallpaper is somehow not loaded. Bad things can happen if
   // wallpaper is not loaded at login screen. One example is: crosbug.com/38429.
 }
 
 // Same test as WallpaperManagerBrowserTest.UsePreMigrationWallpaperInfo. But
 // disabled boot and login animation.
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestNoAnimation,
                        PRE_UsePreMigrationWallpaperInfo) {
   // New user log in, a default wallpaper is loaded.
-  LogIn(AccountId::FromUserEmail(kTestUser1), kTestUser1Hash);
+  LogIn(test_account_id1_, kTestUser1Hash);
   wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
   // Old wallpaper migration code doesn't exist in codebase anymore. So if
   // user's profile is not migrated, it is the same as no wallpaper info. To
   // simulate this, we remove user's wallpaper info here.
-  WallpaperManager::Get()->RemoveUserWallpaperInfo(kTestUser1);
+  WallpaperManager::Get()->RemoveUserWallpaperInfo(test_account_id1_);
 }
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestNoAnimation,
                        UsePreMigrationWallpaperInfo) {
-  LogIn(AccountId::FromUserEmail(kTestUser1), kTestUser1Hash);
+  LogIn(test_account_id1_, kTestUser1Hash);
   wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
   // This test should finish normally. If timeout, it is probably because chrome
   // can not handle pre migrated user profile (M21 profile or older).
 }
 
 class WallpaperManagerBrowserTestCrashRestore
     : public WallpaperManagerBrowserTest {
  public:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitch(chromeos::switches::kDisableLoginAnimations);
     command_line->AppendSwitch(chromeos::switches::kDisableBootAnimation);
-    command_line->AppendSwitchASCII(switches::kLoginUser, kTestUser1);
+    command_line->AppendSwitchASCII(switches::kLoginUser,
+                                    test_account_id1_.GetUserEmail());
     command_line->AppendSwitchASCII(switches::kLoginProfile, "user");
   }
 };
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestCrashRestore,
                        PRE_RestoreWallpaper) {
-  LogIn(AccountId::FromUserEmail(kTestUser1), kTestUser1Hash);
+  LogIn(test_account_id1_, kTestUser1Hash);
   wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
 }
 
 // Test for crbug.com/270278. It simulates a browser crash and verifies if user
 // wallpaper is loaded.
 // Fails on the MSAN bots. See http://crbug.com/444477
 #if defined(MEMORY_SANITIZER)
 #define MAYBE_RestoreWallpaper DISABLED_RestoreWallpaper
 #else
 #define MAYBE_RestoreWallpaper RestoreWallpaper
 #endif
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestCrashRestore,
                        MAYBE_RestoreWallpaper) {
   EXPECT_EQ(1, LoadedWallpapers());
 }
 
 class WallpaperManagerBrowserTestCacheUpdate
     : public WallpaperManagerBrowserTest {
  public:
   void SetUpCommandLine(base::CommandLine* command_line) override {
-    command_line->AppendSwitchASCII(switches::kLoginUser, kTestUser1);
+    command_line->AppendSwitchASCII(switches::kLoginUser,
+                                    test_account_id1_.GetUserEmail());
     command_line->AppendSwitchASCII(switches::kLoginProfile, "user");
   }
  protected:
   // Creates a test image of size 1x1.
   gfx::ImageSkia CreateTestImage(SkColor color) {
     return wallpaper_manager_test_utils::CreateTestImage(1, 1, color);
   }
 };
 
-// Sets kTestUser1's wallpaper to a custom wallpaper.
+// Sets test_account_id1_'s wallpaper to a custom wallpaper.
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestCacheUpdate,
                        PRE_VerifyWallpaperCache) {
-  // Add kTestUser1 to user list. kTestUser1 is the default login profile.
-  LogIn(AccountId::FromUserEmail(kTestUser1), kTestUser1Hash);
+  // Add test_account_id1_ to user list.
+  // test_account_id1_ is the default login profile.
+  LogIn(test_account_id1_, kTestUser1Hash);
 
   std::string id = base::Int64ToString(base::Time::Now().ToInternalValue());
   WallpaperManager* wallpaper_manager = WallpaperManager::Get();
   base::FilePath small_wallpaper_path = GetCustomWallpaperPath(
       wallpaper::kSmallWallpaperSubDir, kTestUser1Hash, id);
   base::FilePath large_wallpaper_path = GetCustomWallpaperPath(
       wallpaper::kLargeWallpaperSubDir, kTestUser1Hash, id);
 
   // Saves the small/large resolution wallpapers to small/large custom
   // wallpaper paths.
   ASSERT_TRUE(wallpaper_manager_test_utils::WriteJPEGFile(
       small_wallpaper_path,
       kSmallWallpaperWidth,
       kSmallWallpaperHeight,
       wallpaper_manager_test_utils::kSmallDefaultWallpaperColor));
   ASSERT_TRUE(wallpaper_manager_test_utils::WriteJPEGFile(
       large_wallpaper_path,
       kLargeWallpaperWidth,
       kLargeWallpaperHeight,
       wallpaper_manager_test_utils::kLargeDefaultWallpaperColor));
 
   std::string relative_path = base::FilePath(kTestUser1Hash).Append(id).value();
-  // Saves wallpaper info to local state for user |kTestUser1|.
+  // Saves wallpaper info to local state for user |test_account_id1_|.
   WallpaperInfo info = {relative_path, WALLPAPER_LAYOUT_CENTER_CROPPED,
                         user_manager::User::CUSTOMIZED,
                         base::Time::Now().LocalMidnight()};
-  wallpaper_manager->SetUserWallpaperInfo(kTestUser1, info, true);
-  wallpaper_manager->SetUserWallpaperNow(kTestUser1);
+  wallpaper_manager->SetUserWallpaperInfo(test_account_id1_, info, true);
+  wallpaper_manager->SetUserWallpaperNow(test_account_id1_);
   wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
   scoped_ptr<WallpaperManager::TestApi> test_api;
   test_api.reset(new WallpaperManager::TestApi(wallpaper_manager));
   // Verify SetUserWallpaperNow updates wallpaper cache.
   gfx::ImageSkia cached_wallpaper;
-  EXPECT_TRUE(test_api->GetWallpaperFromCache(kTestUser1, &cached_wallpaper));
+  EXPECT_TRUE(
+      test_api->GetWallpaperFromCache(test_account_id1_, &cached_wallpaper));
   base::FilePath path;
-  EXPECT_TRUE(test_api->GetPathFromCache(kTestUser1, &path));
+  EXPECT_TRUE(test_api->GetPathFromCache(test_account_id1_, &path));
   EXPECT_FALSE(path.empty());
 }
 
 // Tests for crbug.com/339576. Wallpaper cache should be updated in
 // multi-profile mode when user:
 // 1. chooses an online wallpaper from wallpaper
 //    picker (calls SetWallpaperFromImageSkia);
 // 2. chooses a custom wallpaper from wallpaper
 //    picker (calls SetCustomWallpaper);
 // 3. reverts to a default wallpaper.
 // Also, when user login at multi-profile mode, previous logged in users'
 // wallpaper cache should not be deleted.
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestCacheUpdate,
                        VerifyWallpaperCache) {
   WallpaperManager* wallpaper_manager = WallpaperManager::Get();
 
   // Force load initial wallpaper
   // (simulate DesktopBackgroundController::UpdateDisplay()).
   wallpaper_manager->UpdateWallpaper(true);
   wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
   scoped_ptr<WallpaperManager::TestApi> test_api;
   test_api.reset(new WallpaperManager::TestApi(wallpaper_manager));
   gfx::ImageSkia cached_wallpaper;
   // Previous custom wallpaper should be cached after user login.
-  EXPECT_TRUE(test_api->GetWallpaperFromCache(kTestUser1, &cached_wallpaper));
+  EXPECT_TRUE(
+      test_api->GetWallpaperFromCache(test_account_id1_, &cached_wallpaper));
   base::FilePath original_path;
-  EXPECT_TRUE(test_api->GetPathFromCache(kTestUser1, &original_path));
+  EXPECT_TRUE(test_api->GetPathFromCache(test_account_id1_, &original_path));
   EXPECT_FALSE(original_path.empty());
 
-  LogIn(AccountId::FromUserEmail(kTestUser2), kTestUser2Hash);
+  LogIn(test_account_id2_, kTestUser2Hash);
   wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
   // Login another user should not delete logged in user's wallpaper cache.
-  // Note active user is still kTestUser1.
-  EXPECT_TRUE(test_api->GetWallpaperFromCache(kTestUser1, &cached_wallpaper));
+  // Note active user is still test_account_id1_.
+  EXPECT_TRUE(
+      test_api->GetWallpaperFromCache(test_account_id1_, &cached_wallpaper));
   base::FilePath path;
-  EXPECT_TRUE(test_api->GetPathFromCache(kTestUser1, &path));
+  EXPECT_TRUE(test_api->GetPathFromCache(test_account_id1_, &path));
   EXPECT_EQ(original_path, path);
 
   gfx::ImageSkia red_wallpaper = CreateTestImage(SK_ColorRED);
-  wallpaper_manager->SetWallpaperFromImageSkia(kTestUser1,
-                                               red_wallpaper,
-                                               WALLPAPER_LAYOUT_CENTER,
-                                               true);
+  wallpaper_manager->SetWallpaperFromImageSkia(test_account_id1_, red_wallpaper,
+                                               WALLPAPER_LAYOUT_CENTER, true);
   wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
   // SetWallpaperFromImageSkia should update wallpaper cache when multi-profile
   // is turned on.
-  EXPECT_TRUE(test_api->GetWallpaperFromCache(kTestUser1, &cached_wallpaper));
-  EXPECT_TRUE(test_api->GetPathFromCache(kTestUser1, &path));
+  EXPECT_TRUE(
+      test_api->GetWallpaperFromCache(test_account_id1_, &cached_wallpaper));
+  EXPECT_TRUE(test_api->GetPathFromCache(test_account_id1_, &path));
   EXPECT_TRUE(cached_wallpaper.BackedBySameObjectAs(red_wallpaper));
 
   gfx::ImageSkia green_wallpaper = CreateTestImage(SK_ColorGREEN);
-  wallpaper_manager->SetCustomWallpaper(kTestUser1,
-                                        kTestUser1Hash,
+  wallpaper_manager->SetCustomWallpaper(test_account_id1_, kTestUser1Hash,
                                         "dummy",  // dummy file name
                                         WALLPAPER_LAYOUT_CENTER,
                                         user_manager::User::CUSTOMIZED,
-                                        green_wallpaper,
-                                        true);
+                                        green_wallpaper, true);
   wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
   // SetCustomWallpaper should also update wallpaper cache when multi-profile is
   // turned on.
-  EXPECT_TRUE(test_api->GetWallpaperFromCache(kTestUser1, &cached_wallpaper));
+  EXPECT_TRUE(
+      test_api->GetWallpaperFromCache(test_account_id1_, &cached_wallpaper));
   EXPECT_TRUE(cached_wallpaper.BackedBySameObjectAs(green_wallpaper));
-  EXPECT_TRUE(test_api->GetPathFromCache(kTestUser1, &path));
+  EXPECT_TRUE(test_api->GetPathFromCache(test_account_id1_, &path));
   EXPECT_NE(original_path, path);
 
-  wallpaper_manager->SetDefaultWallpaperNow(kTestUser1);
+  wallpaper_manager->SetDefaultWallpaperNow(test_account_id1_);
   wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
   // SetDefaultWallpaper should invalidate the user's wallpaper cache.
-  EXPECT_FALSE(test_api->GetWallpaperFromCache(kTestUser1, &cached_wallpaper));
+  EXPECT_FALSE(
+      test_api->GetWallpaperFromCache(test_account_id1_, &cached_wallpaper));
 }
 
 // ----------------------------------------------------------------------
 // Test default wallpapers.
 
 class TestObserver : public WallpaperManager::Observer {
  public:
   explicit TestObserver(WallpaperManager* wallpaper_manager)
       : update_wallpaper_count_(0), wallpaper_manager_(wallpaper_manager) {
     DCHECK(wallpaper_manager_);
     wallpaper_manager_->AddObserver(this);
   }
 
   ~TestObserver() override { wallpaper_manager_->RemoveObserver(this); }
 
-  void OnWallpaperAnimationFinished(const std::string&) override {}
+  void OnWallpaperAnimationFinished(const AccountId& account_id) override {}
 
   void OnUpdateWallpaperForTesting() override { ++update_wallpaper_count_; }
 
   int GetUpdateWallpaperCountAndReset() {
     const size_t old = update_wallpaper_count_;
     update_wallpaper_count_ = 0;
     return old;
   }
 
  private:
@@ skipping 105 matching lines @@
 // Splitting these into separate tests avoids needing to run animations.
 // TODO(derat): Combine these into a single test
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest, SmallDefaultWallpaper) {
   if (!ash::test::AshTestHelper::SupportsMultipleDisplays())
     return;
 
   CreateCmdlineWallpapers();
 
   // At 800x600, the small wallpaper should be loaded.
   UpdateDisplay("800x600");
-  WallpaperManager::Get()->SetDefaultWallpaperNow(std::string());
+  WallpaperManager::Get()->SetDefaultWallpaperNow(EmptyAccountId());
   wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
   EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor(
       controller_->GetWallpaper(),
       wallpaper_manager_test_utils::kSmallDefaultWallpaperColor));
 }
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest, LargeDefaultWallpaper) {
   if (!ash::test::AshTestHelper::SupportsMultipleDisplays())
     return;
 
   CreateCmdlineWallpapers();
   UpdateDisplay("1600x1200");
-  WallpaperManager::Get()->SetDefaultWallpaperNow(std::string());
+  WallpaperManager::Get()->SetDefaultWallpaperNow(EmptyAccountId());
   wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
   EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor(
       controller_->GetWallpaper(),
       wallpaper_manager_test_utils::kLargeDefaultWallpaperColor));
 }
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest,
                        LargeDefaultWallpaperWhenRotated) {
   if (!ash::test::AshTestHelper::SupportsMultipleDisplays())
     return;
   CreateCmdlineWallpapers();
 
   UpdateDisplay("1200x800/r");
-  WallpaperManager::Get()->SetDefaultWallpaperNow(std::string());
+  WallpaperManager::Get()->SetDefaultWallpaperNow(EmptyAccountId());
   wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
   EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor(
       controller_->GetWallpaper(),
       wallpaper_manager_test_utils::kLargeDefaultWallpaperColor));
 }
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest, SmallGuestWallpaper) {
   if (!ash::test::AshTestHelper::SupportsMultipleDisplays())
     return;
   CreateCmdlineWallpapers();
   user_manager::UserManager::Get()->UserLoggedIn(
       chromeos::login::GuestAccountId(), chromeos::login::kGuestUserName,
       false);
   UpdateDisplay("800x600");
-  WallpaperManager::Get()->SetDefaultWallpaperNow(std::string());
+  WallpaperManager::Get()->SetDefaultWallpaperNow(EmptyAccountId());
   wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
   EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor(
       controller_->GetWallpaper(),
       wallpaper_manager_test_utils::kSmallGuestWallpaperColor));
 }
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest, LargeGuestWallpaper) {
   if (!ash::test::AshTestHelper::SupportsMultipleDisplays())
     return;
 
   CreateCmdlineWallpapers();
   user_manager::UserManager::Get()->UserLoggedIn(
       chromeos::login::GuestAccountId(), chromeos::login::kGuestUserName,
       false);
   UpdateDisplay("1600x1200");
-  WallpaperManager::Get()->SetDefaultWallpaperNow(std::string());
+  WallpaperManager::Get()->SetDefaultWallpaperNow(EmptyAccountId());
   wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
   EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor(
       controller_->GetWallpaper(),
       wallpaper_manager_test_utils::kLargeGuestWallpaperColor));
 }
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest, SmallChildWallpaper) {
   if (!ash::test::AshTestHelper::SupportsMultipleDisplays())
     return;
   CreateCmdlineWallpapers();
-  LogInAsChild(AccountId::FromUserEmail(kTestUser1), kTestUser1Hash);
+  LogInAsChild(test_account_id1_, kTestUser1Hash);
   UpdateDisplay("800x600");
-  WallpaperManager::Get()->SetDefaultWallpaperNow(std::string());
+  WallpaperManager::Get()->SetDefaultWallpaperNow(EmptyAccountId());
   wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
   EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor(
       controller_->GetWallpaper(),
       wallpaper_manager_test_utils::kSmallChildWallpaperColor));
 }
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest, LargeChildWallpaper) {
   if (!ash::test::AshTestHelper::SupportsMultipleDisplays())
     return;
 
   CreateCmdlineWallpapers();
-  LogInAsChild(AccountId::FromUserEmail(kTestUser1), kTestUser1Hash);
+  LogInAsChild(test_account_id1_, kTestUser1Hash);
   UpdateDisplay("1600x1200");
-  WallpaperManager::Get()->SetDefaultWallpaperNow(std::string());
+  WallpaperManager::Get()->SetDefaultWallpaperNow(EmptyAccountId());
   wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
   EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor(
       controller_->GetWallpaper(),
       wallpaper_manager_test_utils::kLargeChildWallpaperColor));
 }
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest,
                        SwitchBetweenDefaultAndCustom) {
   // Start loading the default wallpaper.
   UpdateDisplay("640x480");
   CreateCmdlineWallpapers();
   user_manager::UserManager::Get()->UserLoggedIn(
       chromeos::login::StubAccountId(), "test_hash", false);
 
-  WallpaperManager::Get()->SetDefaultWallpaperNow(std::string());
+  WallpaperManager::Get()->SetDefaultWallpaperNow(EmptyAccountId());
 
   // Custom wallpaper should be applied immediately, canceling the default
   // wallpaper load task.
   gfx::ImageSkia image = wallpaper_manager_test_utils::CreateTestImage(
       640, 480, wallpaper_manager_test_utils::kCustomWallpaperColor);
-  WallpaperManager::Get()->SetCustomWallpaper(chromeos::login::kStubUser,
-                                              "test_hash",
-                                              "test-nofile.jpeg",
-                                              WALLPAPER_LAYOUT_STRETCH,
-                                              user_manager::User::CUSTOMIZED,
-                                              image,
-                                              true);
+  WallpaperManager::Get()->SetCustomWallpaper(
+      chromeos::login::StubAccountId(), "test_hash", "test-nofile.jpeg",
+      WALLPAPER_LAYOUT_STRETCH, user_manager::User::CUSTOMIZED, image, true);
   wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
 
   EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor(
       controller_->GetWallpaper(),
       wallpaper_manager_test_utils::kCustomWallpaperColor));
 
-  WallpaperManager::Get()->SetDefaultWallpaperNow(std::string());
+  WallpaperManager::Get()->SetDefaultWallpaperNow(EmptyAccountId());
   wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
 
   EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor(
       controller_->GetWallpaper(),
       wallpaper_manager_test_utils::kSmallDefaultWallpaperColor));
 }
 
 }  // namespace chromeos