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 c47745631a58bfd68fef53bc63731ed414d7c342..05016218336130be0e9e601a642c8d0dfee93d13 100644 |
--- a/chrome/browser/chromeos/login/wallpaper_manager_unittest.cc |
+++ b/chrome/browser/chromeos/login/wallpaper_manager_unittest.cc |
@@ -20,6 +20,7 @@ |
#include "chrome/browser/chromeos/login/wallpaper_manager.h" |
#include "chrome/browser/chromeos/settings/cros_settings.h" |
#include "chrome/browser/chromeos/settings/device_settings_service.h" |
+#include "chrome/browser/prefs/browser_prefs.h" |
#include "chrome/common/chrome_switches.h" |
#include "chrome/test/base/testing_browser_process.h" |
#include "chromeos/chromeos_switches.h" |
@@ -47,13 +48,8 @@ class WallpaperManagerTest : public test::AshTestBase { |
// Register an in-memory local settings instance. |
local_state_.reset(new TestingPrefServiceSimple); |
TestingBrowserProcess::GetGlobal()->SetLocalState(local_state_.get()); |
- UserManager::RegisterPrefs(local_state_->registry()); |
- // Wallpaper manager and user image managers prefs will be accessed by the |
- // unit-test as well. |
- UserImageManager::RegisterPrefs(local_state_->registry()); |
- WallpaperManager::RegisterPrefs(local_state_->registry()); |
+ chrome::RegisterLocalState(local_state_->registry()); |
- StartupUtils::RegisterPrefs(local_state_->registry()); |
StartupUtils::MarkDeviceRegistered(); |
ResetUserManager(); |
@@ -86,6 +82,14 @@ class WallpaperManagerTest : public test::AshTestBase { |
base::MessageLoop::current()->RunUntilIdle(); |
} |
+ const base::FilePath& GetWallpaperManagerGuestSmallFile() const { |
+ return WallpaperManager::Get()->guest_default_small_wallpaper_file_; |
+ } |
+ |
+ const base::FilePath& GetWallpaperManagerGuestLargeFile() const { |
+ return WallpaperManager::Get()->guest_default_large_wallpaper_file_; |
+ } |
+ |
protected: |
CommandLine command_line_; |
@@ -128,8 +132,14 @@ TEST_F(WallpaperManagerTest, GuestUserUseGuestWallpaper) { |
UserManager::Get()->UserLoggedIn(UserManager::kGuestUserName, |
UserManager::kGuestUserName, false); |
WaitAsyncWallpaperLoad(); |
- EXPECT_FALSE(ash::Shell::GetInstance()->desktop_background_controller()-> |
- SetDefaultWallpaper(true)); |
+ const base::FilePath& guest_wallpaper_small = |
+ GetWallpaperManagerGuestSmallFile(); |
+ const base::FilePath& guest_wallpaper_large = |
+ GetWallpaperManagerGuestLargeFile(); |
+ EXPECT_FALSE( |
+ ash::Shell::GetInstance() |
+ ->desktop_background_controller() |
+ ->SetDefaultWallpaper(guest_wallpaper_small, guest_wallpaper_large)); |
} |
class WallpaperManagerCacheTest : public test::AshTestBase { |