Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc |
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc |
index a65a64ea10ce45ae76c57616a4aefaf4a673eea8..871f373e78597ee17b624db33700e0c253d9a538 100644 |
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc |
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc |
@@ -52,6 +52,7 @@ |
#include "chrome/browser/apps/scoped_keep_alive.h" |
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h" |
#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" |
+#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" |
#include "chrome/browser/ui/apps/chrome_app_delegate.h" |
#include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h" |
#include "chrome/browser/ui/ash/launcher/browser_status_monitor.h" |
@@ -783,6 +784,9 @@ class MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerTest |
user_manager_enabler_.reset(new chromeos::ScopedUserManagerEnabler( |
new chromeos::FakeChromeUserManager)); |
+ // Initialize the WallpaperManager singleton. |
+ chromeos::WallpaperManager::Initialize(); |
+ |
// Initialize the rest. |
ChromeLauncherControllerTest::SetUp(); |
@@ -799,6 +803,7 @@ class MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerTest |
for (ProfileToNameMap::iterator it = created_profiles_.begin(); |
it != created_profiles_.end(); ++it) |
profile_manager_->DeleteTestingProfile(it->second); |
+ chromeos::WallpaperManager::Shutdown(); |
// A Task is leaked if we don't destroy everything, then run the message |
// loop. |