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

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

Issue 23480087: Use username_hash instead of email (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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/wallpaper_manager_browsertest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/wallpaper_manager_unittest.cc
diff --git a/chrome/browser/chromeos/login/wallpaper_manager_unittest.cc b/chrome/browser/chromeos/login/wallpaper_manager_unittest.cc
index 4dc6cbe34d2f38188a1cf426560f14c1d6dc000f..773ca8f4911be0ecf1d313ace691a4530512ba8f 100644
--- a/chrome/browser/chromeos/login/wallpaper_manager_unittest.cc
+++ b/chrome/browser/chromeos/login/wallpaper_manager_unittest.cc
@@ -33,6 +33,7 @@ using namespace ash;
namespace {
const char kTestUser1[] = "test-user@example.com";
+const char kTestUser1Hash[] = "test-user@example.com-hash";
const int kLargeWallpaperResourceId = IDR_AURA_WALLPAPER_DEFAULT_LARGE;
const int kSmallWallpaperResourceId = IDR_AURA_WALLPAPER_DEFAULT_SMALL;
@@ -105,14 +106,13 @@ class WallpaperManagerTest : public test::AshTestBase {
// Test for crbug.com/260755. If this test fails, it is probably because the
// wallpaper of last logged in user is set as guest wallpaper.
TEST_F(WallpaperManagerTest, GuestUserUseGuestWallpaper) {
- UserManager::Get()->UserLoggedIn(kTestUser1, kTestUser1, false);
-
- base::FilePath old_wallpaper_path = WallpaperManager::Get()->
- GetOriginalWallpaperPathForUser(kTestUser1);
+ UserManager::Get()->UserLoggedIn(kTestUser1, kTestUser1Hash, false);
+ std::string relative_path =
+ base::FilePath(kTestUser1Hash).Append(FILE_PATH_LITERAL("DUMMY")).value();
// Saves wallpaper info to local state for user |kTestUser1|.
WallpaperInfo info = {
- "DUMMY",
+ relative_path,
WALLPAPER_LAYOUT_CENTER_CROPPED,
User::CUSTOMIZED,
base::Time::Now().LocalMidnight()
« no previous file with comments | « chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698