Address races in UserImageManagerImpl

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"
 #include "ash/shell.h"
 #include "ash/test/display_manager_test_api.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
+#include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
+#include "base/path_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
+#include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "ui/aura/env.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using namespace ash;
 
@@ skipping 71 matching lines @@
 
     return wallpaper_path;
   }
 
   // Logs in |username|.
   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,
+  void SaveUserWallpaperData(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(
         wallpaper_path,
         reinterpret_cast<const char*>(image_data->front()),
         image_data->size());
     EXPECT_EQ(static_cast<int>(image_data->size()), written);
   }
@@ skipping 22 matching lines @@
       kSmallWallpaperSubDir,
       kTestUser1Hash,
       id);
   base::FilePath large_wallpaper_path = GetCustomWallpaperPath(
       kLargeWallpaperSubDir,
       kTestUser1Hash,
       id);
 
   // Saves the small/large resolution wallpapers to small/large custom
   // wallpaper paths.
-  SaveUserWallpaperData(kTestUser1,
-                        small_wallpaper_path,
+  SaveUserWallpaperData(small_wallpaper_path,
                         kSmallWallpaperResourceId);
-  SaveUserWallpaperData(kTestUser1,
-                        large_wallpaper_path,
+  SaveUserWallpaperData(large_wallpaper_path,
                         kLargeWallpaperResourceId);
 
   std::string relative_path = base::FilePath(kTestUser1Hash).Append(id).value();
   // Saves wallpaper info to local state for user |kTestUser1|.
   WallpaperInfo info = {
       relative_path,
       WALLPAPER_LAYOUT_CENTER_CROPPED,
       User::CUSTOMIZED,
       base::Time::Now().LocalMidnight()
   };
@@ skipping 60 matching lines @@
   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,
       kTestUser1Hash,
       id);
-  SaveUserWallpaperData(kTestUser1,
-                        small_wallpaper_path,
+  SaveUserWallpaperData(small_wallpaper_path,
                         kSmallWallpaperResourceId);
 
   std::string relative_path = base::FilePath(kTestUser1Hash).Append(id).value();
   // Saves wallpaper info to local state for user |kTestUser1|.
   WallpaperInfo info = {
       relative_path,
       WALLPAPER_LAYOUT_CENTER_CROPPED,
       User::CUSTOMIZED,
       base::Time::Now().LocalMidnight()
   };
@@ skipping 21 matching lines @@
   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()
   };
+  base::FilePath user_data_dir;
+  ASSERT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
+  SaveUserWallpaperData(user_data_dir.Append("123"),
+                        kLargeWallpaperResourceId);
   WallpaperManager::Get()->SetUserWallpaperInfo(kTestUser1, info, true);
 }
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest,
                        UseMigratedWallpaperInfo) {
   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.
@@ skipping 55 matching lines @@
   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()
   };
+  base::FilePath user_data_dir;
+  ASSERT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
+  SaveUserWallpaperData(user_data_dir.Append("123"),
+                        kLargeWallpaperResourceId);
   WallpaperManager::Get()->SetUserWallpaperInfo(kTestUser1, info, true);
 }
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestNoAnimation,
                        UseMigratedWallpaperInfo) {
   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.
@@ skipping 39 matching lines @@
 }
 
 // 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