Index: chrome/browser/chromeos/login/login_utils_browsertest.cc |
diff --git a/chrome/browser/chromeos/login/login_utils_browsertest.cc b/chrome/browser/chromeos/login/login_utils_browsertest.cc |
index 62b4be1a4a539b87c0af48691c99df66ae4b9530..78adc4238f30f2f250abaeceb6ccca3669fd4a95 100644 |
--- a/chrome/browser/chromeos/login/login_utils_browsertest.cc |
+++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc |
@@ -18,6 +18,7 @@ |
#include "base/threading/thread.h" |
#include "chrome/browser/chrome_content_browser_client.h" |
#include "chrome/browser/chrome_notification_types.h" |
+#include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" |
#include "chrome/browser/chromeos/input_method/input_method_configuration.h" |
#include "chrome/browser/chromeos/input_method/mock_input_method_manager.h" |
#include "chrome/browser/chromeos/login/auth/authenticator.h" |
@@ -258,6 +259,9 @@ class LoginUtilsTest : public testing::Test, |
NULL, NULL)); |
browser_process_->SetIOThread(io_thread_state_.get()); |
+ browser_process_->platform_part()->InitializeSessionManager( |
+ *CommandLine::ForCurrentProcess(), NULL, true); |
+ |
#if defined(ENABLE_RLZ) |
rlz_initialized_cb_ = base::Bind(&base::DoNothing); |
rlz_lib::testing::SetRlzStoreDirectory(scoped_temp_dir_.path()); |
@@ -276,11 +280,13 @@ class LoginUtilsTest : public testing::Test, |
message_center::MessageCenter::Shutdown(); |
- test_user_manager_.reset(); |
+ KioskAppManager::Shutdown(); |
InvokeOnIO( |
base::Bind(&LoginUtilsTest::TearDownOnIO, base::Unretained(this))); |
+ test_user_manager_.reset(); |
+ |
// LoginUtils instance must not outlive Profile instances. |
LoginUtils::Set(NULL); |