chromeos: wireup more display management for mushrome

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 160 matching lines @@
       std::unique_ptr<aura::InputStateLookup>());
 
   Shell* shell = Shell::Get();
   session_controller_client_.reset(
       new TestSessionControllerClient(shell->session_controller()));
   session_controller_client_->InitializeAndBind();
 
   if (start_session)
     session_controller_client_->CreatePredefinedUserSessions(1);
 
-  if (config_ == Config::CLASSIC) {
-    // ScreenLayoutObserver is specific to classic-ash.
+  // TODO(sky): mash should use this too http://crbug.com/718860.
+  if (config_ != Config::MASH) {
     // Tests that change the display configuration generally don't care about
     // the notifications and the popup UI can interfere with things like
     // cursors.
     shell->screen_layout_observer()->set_show_notifications_for_testing(false);
 
-    // DisplayManager is specific to classic-ash.
     display::test::DisplayManagerTestApi(shell->display_manager())
         .DisableChangeDisplayUponHostResize();
     DisplayConfigurationControllerTestApi(
         shell->display_configuration_controller())
         .DisableDisplayAnimator();
+  }
 
+  if (config_ == Config::CLASSIC) {
     // TODO: disabled for mash as AcceleratorControllerDelegateAura isn't
     // created in mash http://crbug.com/632111.
     test_screenshot_delegate_ = new TestScreenshotDelegate();
     ShellPortClassic::Get()
         ->accelerator_controller_delegate()
         ->SetScreenshotDelegate(
             std::unique_ptr<ScreenshotDelegate>(test_screenshot_delegate_));
   } else if (config_ == Config::MUS) {
     test_screenshot_delegate_ = new TestScreenshotDelegate();
     mus::ShellPortMash::Get()
@@ skipping 206 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