Revert of chromeos: Makes mushrome use simplified display management

ash/test/ash_test_helper.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/test/ash_test_helper.h"
 
 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
 #include "ash/ash_switches.h"
 #include "ash/aura/shell_port_classic.h"
 #include "ash/mus/bridge/shell_port_mash.h"
@@ skipping 222 matching lines @@
     device::BluetoothAdapterFactory::Shutdown();
     bluez::BluezDBusManager::Shutdown();
     bluez_dbus_manager_initialized_ = false;
   }
 
   if (dbus_thread_manager_initialized_) {
     chromeos::DBusThreadManager::Shutdown();
     dbus_thread_manager_initialized_ = false;
   }
 
-  if (config_ == Config::CLASSIC)
-    ui::TerminateContextFactoryForTests();
+  ui::TerminateContextFactoryForTests();
 
   ui::ShutdownInputMethodForTesting();
   zero_duration_mode_.reset();
 
   test_views_delegate_.reset();
   wm_state_.reset();
 
   input_device_client_.reset();
 
   command_line_.reset();
@@ skipping 47 matching lines @@
   }
   const bool in_shutdown = false;
   while (root_window_controllers.size() > parts.size()) {
     window_manager_app_->window_manager()->DestroyRootWindowController(
         root_window_controllers.back(), in_shutdown);
     root_window_controllers.pop_back();
   }
 }
 
 display::Display AshTestHelper::GetSecondaryDisplay() {
-  if (config_ != Config::MASH)
+  if (config_ == Config::CLASSIC)
     return Shell::Get()->display_manager()->GetSecondaryDisplay();
 
   std::vector<RootWindowController*> roots = GetRootsOrderedByDisplayId();
   CHECK_LE(2U, roots.size());
   return roots.size() < 2 ? display::Display()
                           : roots[1]->GetWindow()->GetDisplayNearestWindow();
 }
 
 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()
       ->create_session_state_delegate_stub_for_test_ = false;
 
   window_tree_client_setup_.InitForWindowManager(
       window_manager_app_->window_manager_.get(),
       window_manager_app_->window_manager_.get());
   aura::test::EnvTestHelper().SetWindowTreeClient(
       window_tree_client_setup_.window_tree_client());
   // Classic ash does not start the NetworkHandler in tests, so don't start it
   // for mash either. The NetworkHandler may cause subtle side effects (such as
   // additional tray items) that can make for flaky tests.
   const bool init_network_handler = false;
   window_manager_app_->InitWindowManager(
       window_tree_client_setup_.OwnWindowTreeClient(),
       ash_test_environment_->GetBlockingPool(), init_network_handler);
 
   aura::WindowTreeClient* window_tree_client =
       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.
   CHECK(!chromeos::NetworkHandler::IsInitialized());
 }
 
 void AshTestHelper::CreateShell() {
   CHECK(config_ == Config::CLASSIC);
   ui::ContextFactory* context_factory = nullptr;
   ui::ContextFactoryPrivate* context_factory_private = nullptr;
@@ skipping 48 matching lines @@
   std::set<RootWindowController*> roots =
       window_manager_app_->window_manager()->GetRootWindowControllers();
   std::vector<RootWindowController*> ordered_roots;
   ordered_roots.insert(ordered_roots.begin(), roots.begin(), roots.end());
   std::sort(ordered_roots.begin(), ordered_roots.end(), &CompareByDisplayId);
   return ordered_roots;
 }
 
 }  // namespace test
 }  // namespace ash