Revert of chromeos: Makes mushrome use simplified display management

ash/test/ash_test_helper.cc

Index: ash/test/ash_test_helper.cc
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc
index 0affe9d9fc12539c0c3d8db6c97c9151237e502d..28d129ed0d133b2634747d8e3994ad41ee08dfef 100644
--- a/ash/test/ash_test_helper.cc
+++ b/ash/test/ash_test_helper.cc
@@ -240,8 +240,7 @@
     dbus_thread_manager_initialized_ = false;
   }
 
-  if (config_ == Config::CLASSIC)
-    ui::TerminateContextFactoryForTests();
+  ui::TerminateContextFactoryForTests();
 
   ui::ShutdownInputMethodForTesting();
   zero_duration_mode_.reset();
@@ -309,7 +308,7 @@
 }
 
 display::Display AshTestHelper::GetSecondaryDisplay() {
-  if (config_ != Config::MASH)
+  if (config_ == Config::CLASSIC)
     return Shell::Get()->display_manager()->GetSecondaryDisplay();
 
   std::vector<RootWindowController*> roots = GetRootsOrderedByDisplayId();
@@ -320,12 +319,10 @@
 
 void AshTestHelper::CreateMashWindowManager() {
   CHECK(config_ != Config::CLASSIC);
-  const bool show_primary_root_on_connect = false;
-  window_manager_app_ = base::MakeUnique<mus::WindowManagerApplication>(
-      show_primary_root_on_connect);
+  window_manager_app_ = base::MakeUnique<mus::WindowManagerApplication>();
 
   window_manager_app_->window_manager_.reset(
-      new mus::WindowManager(nullptr, config_, show_primary_root_on_connect));
+      new mus::WindowManager(nullptr, config_));
   window_manager_app_->window_manager()->shell_delegate_.reset(
       test_shell_delegate_);
   window_manager_app_->window_manager()
@@ -348,12 +345,8 @@
       window_manager_app_->window_manager()->window_tree_client();
   window_tree_client_private_ =
       base::MakeUnique<aura::WindowTreeClientPrivate>(window_tree_client);
-  if (config_ == Config::MUS) {
-    window_tree_client_private_->CallOnConnect();
-  } else {
-    int next_x = 0;
-    CreateRootWindowController("800x600", &next_x);
-  }
+  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.