Use username_hash instead of email

chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc

 // Copyright (c) 2012 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/wallpaper_manager.h"
 
 #include "ash/ash_resources/grit/ash_resources.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/desktop_background_controller_observer.h"
 #include "ash/display/display_manager.h"
@@ skipping 24 matching lines @@
 
 const int kLargeWallpaperResourceId = IDR_AURA_WALLPAPER_DEFAULT_LARGE;
 const int kSmallWallpaperResourceId = IDR_AURA_WALLPAPER_DEFAULT_SMALL;
 
 int kLargeWallpaperWidth = 256;
 int kLargeWallpaperHeight = ash::kLargeWallpaperMaxHeight;
 int kSmallWallpaperWidth = 256;
 int kSmallWallpaperHeight = ash::kSmallWallpaperMaxHeight;
 
 const char kTestUser1[] = "test@domain.com";
+const char kTestUser1Hash[] = "test@domain.com-hash";
 
 }  // namespace
 
 class WallpaperManagerBrowserTest : public InProcessBrowserTest,
                                     public DesktopBackgroundControllerObserver {
  public:
   WallpaperManagerBrowserTest () : controller_(NULL),
                                    local_state_(NULL) {
   }
 
@@ skipping 29 matching lines @@
     base::MessageLoop::current()->Run();
   }
 
   virtual void OnWallpaperDataChanged() OVERRIDE {
     base::MessageLoop::current()->Quit();
   }
 
  protected:
   // Return custom wallpaper path. Create directory if not exist.
   base::FilePath GetCustomWallpaperPath(const char* sub_dir,
-                                        const std::string& email,
+                                        const std::string& username_hash,
                                         const std::string& id) {
     base::FilePath wallpaper_path =
-        WallpaperManager::Get()->GetCustomWallpaperPath(sub_dir, email, id);
+        WallpaperManager::Get()->GetCustomWallpaperPath(sub_dir,
+                                                        username_hash,
+                                                        id);
     if (!base::DirectoryExists(wallpaper_path.DirName()))
       file_util::CreateDirectory(wallpaper_path.DirName());
 
     return wallpaper_path;
   }
 
   // Logs in |username|.
-  void LogIn(const std::string& username) {
-    UserManager::Get()->UserLoggedIn(username, username, false);
+  void LogIn(const std::string& username, const std::string& username_hash) {
+    UserManager::Get()->UserLoggedIn(username, username_hash, false);
   }
 
   // Saves bitmap |resource_id| to disk.
   void SaveUserWallpaperData(const std::string& username,
                              const base::FilePath& wallpaper_path,
                              int resource_id) {
     scoped_refptr<base::RefCountedStaticMemory> image_data(
         ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
             resource_id, ui::SCALE_FACTOR_100P));
     int written = file_util::WriteFile(
@@ skipping 12 matching lines @@
 
  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(kTestUser1);
+  LogIn(kTestUser1, kTestUser1Hash);
   // Wait for default wallpaper loaded.
   WaitAsyncWallpaperLoad();
   std::string id = base::Int64ToString(base::Time::Now().ToInternalValue());
   base::FilePath small_wallpaper_path = GetCustomWallpaperPath(
       kSmallWallpaperSubDir,
-      kTestUser1,
+      kTestUser1Hash,
       id);
   base::FilePath large_wallpaper_path = GetCustomWallpaperPath(
       kLargeWallpaperSubDir,
-      kTestUser1,
+      kTestUser1Hash,
       id);
 
   // Saves the small/large resolution wallpapers to small/large custom
   // wallpaper paths.
   SaveUserWallpaperData(kTestUser1,
                         small_wallpaper_path,
                         kSmallWallpaperResourceId);
   SaveUserWallpaperData(kTestUser1,
                         large_wallpaper_path,
                         kLargeWallpaperResourceId);
 
   // Saves wallpaper info to local state for user |kTestUser1|.
   WallpaperInfo info = {
-      id,
+      std::string(kTestUser1Hash) + "/" + id,

[Nikita (slow), 2013/09/25 14:47:11]

nit: Please use platform specific path separator constant.

[bshe, 2013/09/26 16:49:57]

Will switch to base::FilePath::kSeperators[0] if make sense.

On 2013/09/25 14:47:11, Nikita Kostylev wrote:

       WALLPAPER_LAYOUT_CENTER_CROPPED,
       User::CUSTOMIZED,
       base::Time::Now().LocalMidnight()
   };
   wallpaper_manager->SetUserWallpaperInfo(kTestUser1, info, true);
 
   // Set the wallpaper for |kTestUser1|.
   wallpaper_manager->SetUserWallpaper(kTestUser1);
   WaitAsyncWallpaperLoad();
   gfx::ImageSkia wallpaper = controller_->GetWallpaper();
@@ skipping 35 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(kTestUser1);
+  LogIn(kTestUser1, kTestUser1Hash);
   EXPECT_EQ(1, LoadedWallpapers());
   // Loads the same wallpaper before the initial one finished. It should be
   // prevented.
   wallpaper_manager->SetUserWallpaper(kTestUser1);
   EXPECT_EQ(1, LoadedWallpapers());
   WaitAsyncWallpaperLoad();
   // Loads the same wallpaper after the initial one finished. It should be
   // prevented.
   wallpaper_manager->SetUserWallpaper(kTestUser1);
   EXPECT_EQ(1, LoadedWallpapers());
   wallpaper_manager->ClearWallpaperCache();
 
   // Change wallpaper to a custom wallpaper.
   std::string id = base::Int64ToString(base::Time::Now().ToInternalValue());
   base::FilePath small_wallpaper_path = GetCustomWallpaperPath(
       kSmallWallpaperSubDir,
-      kTestUser1,
+      kTestUser1Hash,
       id);
   SaveUserWallpaperData(kTestUser1,
                         small_wallpaper_path,
                         kSmallWallpaperResourceId);
 
   // Saves wallpaper info to local state for user |kTestUser1|.
   WallpaperInfo info = {
-      id,
+      std::string(kTestUser1Hash) + "/" + id,

[Nikita (slow), 2013/09/25 14:47:11]

nit: Same here.

[bshe, 2013/09/26 16:49:57]

same.

On 2013/09/25 14:47:11, Nikita Kostylev wrote:

       WALLPAPER_LAYOUT_CENTER_CROPPED,
       User::CUSTOMIZED,
       base::Time::Now().LocalMidnight()
   };
   wallpaper_manager->SetUserWallpaperInfo(kTestUser1, info, true);
 
   wallpaper_manager->SetUserWallpaper(kTestUser1);
   EXPECT_EQ(2, LoadedWallpapers());
   // Loads the same wallpaper before the initial one finished. It should be
   // prevented.
   wallpaper_manager->SetUserWallpaper(kTestUser1);
   EXPECT_EQ(2, LoadedWallpapers());
   WaitAsyncWallpaperLoad();
   wallpaper_manager->SetUserWallpaper(kTestUser1);
   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(kTestUser1);
+  LogIn(kTestUser1, kTestUser1Hash);
   WaitAsyncWallpaperLoad();
   // 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::DEFAULT,
       base::Time::Now().LocalMidnight()
   };
   WallpaperManager::Get()->SetUserWallpaperInfo(kTestUser1, info, true);
 }
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest,
                        UseMigratedWallpaperInfo) {
-  LogIn(kTestUser1);
+  LogIn(kTestUser1, kTestUser1Hash);
   WaitAsyncWallpaperLoad();
   // 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(kTestUser1);
+  LogIn(kTestUser1, kTestUser1Hash);
   WaitAsyncWallpaperLoad();
   // 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);
 }
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest,
                        UsePreMigrationWallpaperInfo) {
-  LogIn(kTestUser1);
+  LogIn(kTestUser1, kTestUser1Hash);
   WaitAsyncWallpaperLoad();
   // 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");
@@ skipping 16 matching lines @@
     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(kTestUser1);
+  LogIn(kTestUser1, kTestUser1Hash);
   WaitAsyncWallpaperLoad();
   // 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::DEFAULT,
       base::Time::Now().LocalMidnight()
   };
   WallpaperManager::Get()->SetUserWallpaperInfo(kTestUser1, info, true);
 }
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestNoAnimation,
                        UseMigratedWallpaperInfo) {
-  LogIn(kTestUser1);
+  LogIn(kTestUser1, kTestUser1Hash);
   WaitAsyncWallpaperLoad();
   // 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(kTestUser1);
+  LogIn(kTestUser1, kTestUser1Hash);
   WaitAsyncWallpaperLoad();
   // 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);
 }
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestNoAnimation,
                        UsePreMigrationWallpaperInfo) {
-  LogIn(kTestUser1);
+  LogIn(kTestUser1, kTestUser1Hash);
   WaitAsyncWallpaperLoad();
   // 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:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     command_line->AppendSwitch(chromeos::switches::kDisableLoginAnimations);
     command_line->AppendSwitch(chromeos::switches::kDisableBootAnimation);
     command_line->AppendSwitch(::switches::kMultiProfiles);
     command_line->AppendSwitchASCII(switches::kLoginUser, kTestUser1);
     command_line->AppendSwitchASCII(switches::kLoginProfile,
         CryptohomeClient::GetStubSanitizedUsername(kTestUser1));
   }
 };
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestCrashRestore,
                        PRE_RestoreWallpaper) {
-  LogIn(kTestUser1);
+  LogIn(kTestUser1, kTestUser1Hash);
 }
 
 // Test for crbug.com/270278. It simulates a browser crash and verifies if user
 // wallpaper is loaded.
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestCrashRestore,
                        RestoreWallpaper) {
   EXPECT_EQ(1, LoadedWallpapers());
 }
 
 }  // namespace chromeos