Index: ash/test/ash_test_helper.cc |
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc |
index 3a48ae33f8f2ba546f02f080ca780615f6804bbd..40201b0bda780d791ac483936242879ab93074fa 100644 |
--- a/ash/test/ash_test_helper.cc |
+++ b/ash/test/ash_test_helper.cc |
@@ -216,7 +216,8 @@ void AshTestHelper::TearDown() { |
dbus_thread_manager_initialized_ = false; |
} |
- ui::TerminateContextFactoryForTests(); |
+ if (config_ == Config::CLASSIC) |
+ ui::TerminateContextFactoryForTests(); |
ui::ShutdownInputMethodForTesting(); |
zero_duration_mode_.reset(); |
@@ -282,7 +283,7 @@ void AshTestHelper::UpdateDisplayForMash(const std::string& display_spec) { |
} |
display::Display AshTestHelper::GetSecondaryDisplay() { |
- if (config_ == Config::CLASSIC) |
+ if (config_ != Config::MASH) |
return Shell::Get()->display_manager()->GetSecondaryDisplay(); |
std::vector<RootWindowController*> roots = GetRootsOrderedByDisplayId(); |
@@ -293,10 +294,12 @@ display::Display AshTestHelper::GetSecondaryDisplay() { |
void AshTestHelper::CreateMashWindowManager() { |
CHECK(config_ != Config::CLASSIC); |
- window_manager_app_ = base::MakeUnique<mus::WindowManagerApplication>(); |
+ const bool show_primary_root_on_connect = false; |
+ window_manager_app_ = base::MakeUnique<mus::WindowManagerApplication>( |
+ show_primary_root_on_connect); |
window_manager_app_->window_manager_.reset( |
- new mus::WindowManager(nullptr, config_)); |
+ new mus::WindowManager(nullptr, config_, show_primary_root_on_connect)); |
window_manager_app_->window_manager()->shell_delegate_.reset( |
test_shell_delegate_); |
window_manager_app_->window_manager() |
@@ -319,8 +322,12 @@ void AshTestHelper::CreateMashWindowManager() { |
window_manager_app_->window_manager()->window_tree_client(); |
window_tree_client_private_ = |
base::MakeUnique<aura::WindowTreeClientPrivate>(window_tree_client); |
- int next_x = 0; |
- CreateRootWindowController("800x600", &next_x); |
+ if (config_ == Config::MUS) { |
+ window_tree_client_private_->CallOnConnect(); |
+ } else { |
+ int next_x = 0; |
+ CreateRootWindowController("800x600", &next_x); |
+ } |
// Make sure the NetworkHandler didn't get turned on, see above comment as to |
// why the NetworkHandler should not be running. |