| Index: ash/test/ash_test_helper.cc
|
| diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc
|
| index 86a50d5399736d6253fc5f22321da35f9ced4e27..c9f6c7d56b0acdb60d36f56a42d1851eca36ac97 100644
|
| --- a/ash/test/ash_test_helper.cc
|
| +++ b/ash/test/ash_test_helper.cc
|
| @@ -46,9 +46,11 @@ namespace test {
|
| AshTestHelper::AshTestHelper(base::MessageLoopForUI* message_loop)
|
| : message_loop_(message_loop),
|
| test_shell_delegate_(NULL),
|
| - test_screenshot_delegate_(NULL),
|
| - dbus_thread_manager_initialized_(false) {
|
| + test_screenshot_delegate_(NULL) {
|
| CHECK(message_loop_);
|
| +#if defined(OS_CHROMEOS)
|
| + dbus_thread_manager_initialized_ = false;
|
| +#endif
|
| #if defined(USE_X11)
|
| aura::test::SetUseOverrideRedirectWindowByDefault(true);
|
| #endif
|
|
|