Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4559)

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

Issue 378513005: [Athena] Extract Chrome OS authentication stack (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix includes in one more 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
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..9ecee43e0f5d5968b6adf795ce8cef8ebd43f234 100644
--- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc
+++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc
@@ -31,6 +31,7 @@
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chromeos/chromeos_switches.h"
+#include "chromeos/login/user_names.h"
#include "content/public/test/test_utils.h"
#include "ui/aura/env.h"
#include "ui/gfx/image/image_skia.h"
@@ -344,7 +345,7 @@ IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest,
HotPlugInScreenAtGAIALoginScreen) {
UpdateDisplay("800x600");
// Set initial wallpaper to the default wallpaper.
- WallpaperManager::Get()->SetDefaultWallpaperNow(UserManager::kStubUser);
+ WallpaperManager::Get()->SetDefaultWallpaperNow(chromeos::login::kStubUser);
wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
// Hook up a 2000x2000 display. The large resolution custom wallpaper should
@@ -748,7 +749,7 @@ IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest, SmallGuestWallpaper) {
return;
CreateCmdlineWallpapers();
UserManager::Get()->UserLoggedIn(
- UserManager::kGuestUserName, UserManager::kGuestUserName, false);
+ chromeos::login::kGuestUserName, chromeos::login::kGuestUserName, false);
UpdateDisplay("800x600");
WallpaperManager::Get()->SetDefaultWallpaperNow(std::string());
wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
@@ -763,7 +764,7 @@ IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest, LargeGuestWallpaper) {
CreateCmdlineWallpapers();
UserManager::Get()->UserLoggedIn(
- UserManager::kGuestUserName, UserManager::kGuestUserName, false);
+ chromeos::login::kGuestUserName, chromeos::login::kGuestUserName, false);
UpdateDisplay("1600x1200");
WallpaperManager::Get()->SetDefaultWallpaperNow(std::string());
wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
@@ -777,7 +778,8 @@ IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest,
// Start loading the default wallpaper.
UpdateDisplay("640x480");
CreateCmdlineWallpapers();
- UserManager::Get()->UserLoggedIn(UserManager::kStubUser, "test_hash", false);
+ UserManager::Get()->UserLoggedIn(
+ chromeos::login::kStubUser, "test_hash", false);
WallpaperManager::Get()->SetDefaultWallpaperNow(std::string());
@@ -785,7 +787,7 @@ IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest,
// wallpaper load task.
gfx::ImageSkia image = wallpaper_manager_test_utils::CreateTestImage(
640, 480, wallpaper_manager_test_utils::kCustomWallpaperColor);
- WallpaperManager::Get()->SetCustomWallpaper(UserManager::kStubUser,
+ WallpaperManager::Get()->SetCustomWallpaper(chromeos::login::kStubUser,
"test_hash",
"test-nofile.jpeg",
WALLPAPER_LAYOUT_STRETCH,

Powered by Google App Engine
This is Rietveld 408576698