| 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 4d59af74305413109665553c1c46b11cae98855f..8da9d6f99a2c8478fc4500ba86d8eb33a0ff2916 100644
|
| --- a/chrome/browser/chromeos/login/login_utils_browsertest.cc
|
| +++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc
|
| @@ -51,6 +51,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"
|
| @@ -221,6 +222,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_);
|
|
|
| @@ -327,6 +329,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);
|
|
|