chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc - Issue 1412813003: This CL replaces user_manager::UserID with AccountId.

Unified Diff: chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc

Issue 1412813003: This CL replaces user_manager::UserID with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@468875--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Create-AccountID-structure-part2--user_names

Patch Set: Rebased. Created 5 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/chromeos/login/users/user_manager_unittest.cc ('K') | « chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc ('k') | chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc » ('j') | chrome/browser/chromeos/settings/device_settings_test_helper.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc

diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc

index 9c9f6154f958db9ac4bb7739d02cfb3455b0015b..b4123197c36980adf232a447504691a79adfc87d 100644

--- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc

+++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc

@@ -72,9 +72,9 @@ class WallpaperManagerCacheTest : public test::AshTestBase {

TEST_F(WallpaperManagerCacheTest, VerifyWallpaperCache) {

// Add three users to known users.

- std::string test_user_1 = "test1@example.com";

- std::string test_user_2 = "test2@example.com";

- std::string test_user_3 = "test3@example.com";

+ const AccountId test_user_1 = AccountId::FromUserEmail("test1@example.com");

+ const AccountId test_user_2 = AccountId::FromUserEmail("test2@example.com");

+ const AccountId test_user_3 = AccountId::FromUserEmail("test3@example.com");

base::FilePath path1("path1");

base::FilePath path2("path2");

base::FilePath path3("path3");

@@ -92,27 +92,33 @@ TEST_F(WallpaperManagerCacheTest, VerifyWallpaperCache) {

gfx::ImageSkia test_user_1_wallpaper = CreateTestImage(SK_ColorRED);

gfx::ImageSkia test_user_2_wallpaper = CreateTestImage(SK_ColorGREEN);

gfx::ImageSkia test_user_3_wallpaper = CreateTestImage(SK_ColorWHITE);

- test_api->SetWallpaperCache(test_user_1, path1, test_user_1_wallpaper);

- test_api->SetWallpaperCache(test_user_2, path2, test_user_2_wallpaper);

- test_api->SetWallpaperCache(test_user_3, path3, test_user_3_wallpaper);

+ test_api->SetWallpaperCache(test_user_1.GetUserEmail(), path1,

+ test_user_1_wallpaper);

+ test_api->SetWallpaperCache(test_user_2.GetUserEmail(), path2,

+ test_user_2_wallpaper);

+ test_api->SetWallpaperCache(test_user_3.GetUserEmail(), path3,

+ test_user_3_wallpaper);

test_api->ClearDisposableWallpaperCache();

gfx::ImageSkia cached_wallpaper;

- EXPECT_TRUE(test_api->GetWallpaperFromCache(test_user_1, &cached_wallpaper));

+ EXPECT_TRUE(test_api->GetWallpaperFromCache(test_user_1.GetUserEmail(),

+ &cached_wallpaper));

base::FilePath path;

- EXPECT_TRUE(test_api->GetPathFromCache(test_user_1, &path));

+ EXPECT_TRUE(test_api->GetPathFromCache(test_user_1.GetUserEmail(), &path));

// Logged in users' wallpaper cache should be kept.

EXPECT_TRUE(cached_wallpaper.BackedBySameObjectAs(test_user_1_wallpaper));

EXPECT_EQ(path, path1);

- EXPECT_TRUE(test_api->GetWallpaperFromCache(test_user_2, &cached_wallpaper));

- EXPECT_TRUE(test_api->GetPathFromCache(test_user_2, &path));

+ EXPECT_TRUE(test_api->GetWallpaperFromCache(test_user_2.GetUserEmail(),

+ &cached_wallpaper));

+ EXPECT_TRUE(test_api->GetPathFromCache(test_user_2.GetUserEmail(), &path));

EXPECT_TRUE(cached_wallpaper.BackedBySameObjectAs(test_user_2_wallpaper));

EXPECT_EQ(path, path2);

// Not logged in user's wallpaper cache should be cleared.

- EXPECT_FALSE(test_api->GetWallpaperFromCache(test_user_3, &cached_wallpaper));

- EXPECT_FALSE(test_api->GetPathFromCache(test_user_3, &path));

+ EXPECT_FALSE(test_api->GetWallpaperFromCache(test_user_3.GetUserEmail(),

+ &cached_wallpaper));

+ EXPECT_FALSE(test_api->GetPathFromCache(test_user_3.GetUserEmail(), &path));

}

} // namespace chromeos