chromeos: turn on simplified display management for mash

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 <algorithm>
 #include <set>
 
 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
@@ skipping 170 matching lines @@
 
   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);
 
   // TODO(sky): mash should use this too http://crbug.com/718860.
-  if (config_ != Config::MASH) {
+  if (Shell::ShouldEnableSimplifiedDisplayManagement()) {
     // 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);
 
     display::test::DisplayManagerTestApi(shell->display_manager())
         .DisableChangeDisplayUponHostResize();
     DisplayConfigurationControllerTestApi(
         shell->display_configuration_controller())
         .DisableDisplayAnimator();
@@ skipping 104 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 (Shell::ShouldEnableSimplifiedDisplayManagement())
     return Shell::Get()->display_manager()->GetSecondaryDisplay();
 
   std::vector<RootWindowController*> roots = GetRootsOrderedByDisplayId();
   CHECK_LE(2U, roots.size());
   return roots.size() < 2 ? display::Display()
                           : GetDisplayNearestWindow(roots[1]->GetRootWindow());
 }
 
 void AshTestHelper::CreateMashWindowManager() {
   CHECK(config_ != Config::CLASSIC);
@@ skipping 16 matching lines @@
   // 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) {
+  if (Shell::ShouldEnableSimplifiedDisplayManagement(config_)) {
     window_tree_client_private_->CallOnConnect();
   } else {
     int next_x = 0;
     CreateRootWindowController("800x600", &next_x);
   }
 }
 
 void AshTestHelper::CreateShell() {
   CHECK(config_ == Config::CLASSIC);
   ui::ContextFactory* context_factory = nullptr;
@@ skipping 49 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