chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc - Issue 375413002: Replace chromeos::UserManager::Get() with chromeos::GetUserManager().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 375413002: Replace chromeos::UserManager::Get() with chromeos::GetUserManager(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix test Created 6 years, 5 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

« no previous file with comments | « chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc ('k') | chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 2de237b53959bf1663f419a80702c71c090078ae..79a399d78e1070cb25ac0e7b4ab3670873b60608 100644

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

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

@@ -110,7 +110,7 @@ class WallpaperManagerBrowserTest : public InProcessBrowserTest {

// Logs in |username|.

void LogIn(const std::string& username, const std::string& username_hash) {

- UserManager::Get()->UserLoggedIn(username, username_hash, false);

+ GetUserManager()->UserLoggedIn(username, username_hash, false);

WaitAsyncWallpaperLoadStarted();

}

@@ -747,7 +747,7 @@ IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest, SmallGuestWallpaper) {

if (!ash::test::AshTestHelper::SupportsMultipleDisplays())

return;

CreateCmdlineWallpapers();

- UserManager::Get()->UserLoggedIn(

+ GetUserManager()->UserLoggedIn(

UserManager::kGuestUserName, UserManager::kGuestUserName, false);

UpdateDisplay("800x600");

WallpaperManager::Get()->SetDefaultWallpaperNow(std::string());

@@ -762,7 +762,7 @@ IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest, LargeGuestWallpaper) {

return;

CreateCmdlineWallpapers();

- UserManager::Get()->UserLoggedIn(

+ GetUserManager()->UserLoggedIn(

UserManager::kGuestUserName, UserManager::kGuestUserName, false);

UpdateDisplay("1600x1200");

WallpaperManager::Get()->SetDefaultWallpaperNow(std::string());

@@ -777,7 +777,7 @@ IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest,

// Start loading the default wallpaper.

UpdateDisplay("640x480");

CreateCmdlineWallpapers();

- UserManager::Get()->UserLoggedIn(UserManager::kStubUser, "test_hash", false);

+ GetUserManager()->UserLoggedIn(UserManager::kStubUser, "test_hash", false);

WallpaperManager::Get()->SetDefaultWallpaperNow(std::string());