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 ad71d1c1540fd28f9c9490e2b95c4c507eead2f0..7d6f94b536888f886fde406c6ef15565407fbf7d 100644 |
--- a/chrome/browser/chromeos/login/login_utils_browsertest.cc |
+++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc |
@@ -48,6 +48,7 @@ |
#include "chromeos/dbus/mock_session_manager_client.h" |
#include "chromeos/disks/disk_mount_manager.h" |
#include "chromeos/disks/mock_disk_mount_manager.h" |
+#include "chromeos/login/login_state.h" |
#include "content/public/browser/browser_thread.h" |
#include "content/public/test/test_browser_thread.h" |
#include "content/public/test/test_utils.h" |
@@ -218,6 +219,7 @@ class LoginUtilsTest : public testing::Test, |
// which is part of io_thread_state_. |
DBusThreadManager::InitializeForTesting(&mock_dbus_thread_manager_); |
+ LoginState::Initialize(); |
ConnectivityStateHelper::InitializeForTesting( |
&mock_connectivity_state_helper_); |
@@ -322,6 +324,8 @@ class LoginUtilsTest : public testing::Test, |
// LoginUtils instance must not outlive Profile instances. |
LoginUtils::Set(NULL); |
+ LoginState::Shutdown(); |
+ |
// These trigger some tasks that have to run while BrowserThread::UI |
// exists. Delete all the profiles before deleting the connector. |
browser_process_->SetProfileManager(NULL); |