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..e07a95d9aed2c261ae94cbb306a9da9f1cacbc70 100644 |
--- a/chrome/browser/chromeos/login/wallpaper_manager_unittest.cc |
+++ b/chrome/browser/chromeos/login/wallpaper_manager_unittest.cc |
@@ -7,10 +7,15 @@ |
#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/shell.h" |
#include "ash/test/ash_test_base.h" |
+#include "ash/test/display_manager_test_api.h" |
+#include "ash/test/test_user_wallpaper_delegate.h" |
#include "base/command_line.h" |
#include "base/file_util.h" |
+#include "base/files/file_path.h" |
+#include "base/files/scoped_temp_dir.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/prefs/pref_service.h" |
#include "base/prefs/testing_pref_service.h" |
@@ -20,6 +25,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" |
@@ -27,111 +33,12 @@ |
#include "chromeos/settings/cros_settings_provider.h" |
#include "testing/gtest/include/gtest/gtest.h" |
#include "ui/base/resource/resource_bundle.h" |
+#include "ui/gfx/image/image.h" |
using namespace ash; |
-const char kTestUser1[] = "test-user@example.com"; |
-const char kTestUser1Hash[] = "test-user@example.com-hash"; |
- |
namespace chromeos { |
-class WallpaperManagerTest : public test::AshTestBase { |
- public: |
- WallpaperManagerTest() : command_line_(CommandLine::NO_PROGRAM) {} |
- |
- virtual ~WallpaperManagerTest() {} |
- |
- virtual void SetUp() OVERRIDE { |
- test::AshTestBase::SetUp(); |
- |
- // 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()); |
- |
- StartupUtils::RegisterPrefs(local_state_->registry()); |
- StartupUtils::MarkDeviceRegistered(); |
- |
- ResetUserManager(); |
- } |
- |
- virtual void TearDown() OVERRIDE { |
- // Unregister the in-memory local settings instance. |
- TestingBrowserProcess::GetGlobal()->SetLocalState(0); |
- |
- // Shut down the DeviceSettingsService. |
- DeviceSettingsService::Get()->UnsetSessionManager(); |
- |
- test::AshTestBase::TearDown(); |
- } |
- |
- void ResetUserManager() { |
- // Reset the UserManager singleton. |
- user_manager_enabler_.reset(); |
- // Initialize the UserManager singleton to a fresh UserManagerImpl instance. |
- user_manager_enabler_.reset( |
- new ScopedUserManagerEnabler(new UserManagerImpl)); |
- } |
- |
- void AppendGuestSwitch() { |
- command_line_.AppendSwitch(switches::kGuestSession); |
- WallpaperManager::Get()->set_command_line_for_testing(&command_line_); |
- } |
- |
- void WaitAsyncWallpaperLoad() { |
- base::MessageLoop::current()->RunUntilIdle(); |
- } |
- |
- protected: |
- CommandLine command_line_; |
- |
- scoped_ptr<TestingPrefServiceSimple> local_state_; |
- |
- ScopedTestDeviceSettingsService test_device_settings_service_; |
- ScopedTestCrosSettings test_cros_settings_; |
- |
- scoped_ptr<ScopedUserManagerEnabler> user_manager_enabler_; |
- |
- private: |
- DISALLOW_COPY_AND_ASSIGN(WallpaperManagerTest); |
-}; |
- |
-// 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, 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 = { |
- relative_path, |
- WALLPAPER_LAYOUT_CENTER_CROPPED, |
- User::CUSTOMIZED, |
- base::Time::Now().LocalMidnight() |
- }; |
- WallpaperManager::Get()->SetUserWallpaperInfo(kTestUser1, info, true); |
- ResetUserManager(); |
- |
- AppendGuestSwitch(); |
- scoped_ptr<WallpaperManager::TestApi> test_api; |
- test_api.reset(new WallpaperManager::TestApi(WallpaperManager::Get())); |
- // If last logged in user's wallpaper is used in function InitializeWallpaper, |
- // this test will crash. InitializeWallpaper should be a noop after |
- // AppendGuestSwitch being called. |
- WallpaperManager::Get()->InitializeWallpaper(); |
- EXPECT_TRUE(test_api->current_wallpaper_path().empty()); |
- UserManager::Get()->UserLoggedIn(UserManager::kGuestUserName, |
- UserManager::kGuestUserName, false); |
- WaitAsyncWallpaperLoad(); |
- EXPECT_FALSE(ash::Shell::GetInstance()->desktop_background_controller()-> |
- SetDefaultWallpaper(true)); |
-} |
- |
class WallpaperManagerCacheTest : public test::AshTestBase { |
public: |
WallpaperManagerCacheTest() |