Adds ability for ash_unittests to run in mushrome mode

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/aura/wm_shell_aura.h"
 #include "ash/common/test/test_session_state_delegate.h"
 #include "ash/common/test/test_system_tray_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
+#include "ash/mus/bridge/wm_shell_mus.h"
 #include "ash/mus/screen_mus.h"
 #include "ash/mus/window_manager.h"
 #include "ash/mus/window_manager_application.h"
 #include "ash/public/cpp/config.h"
 #include "ash/shell.h"
 #include "ash/shell_init_params.h"
 #include "ash/system/chromeos/screen_layout_observer.h"
 #include "ash/test/ash_test_environment.h"
 #include "ash/test/ash_test_views_delegate.h"
 #include "ash/test/display_configuration_controller_test_api.h"
@@ skipping 27 matching lines @@
 #include "ui/wm/core/capture_controller.h"
 #include "ui/wm/core/cursor_manager.h"
 #include "ui/wm/core/wm_state.h"
 
 using display::ManagedDisplayInfo;
 
 namespace ash {
 namespace test {
 namespace {
 
-bool IsMash() {
-  // TODO(sky): this won't work correctly for detecting mus vs mash.
-  return aura::Env::GetInstance()->mode() == aura::Env::Mode::MUS;
-}
-
 bool CompareByDisplayId(RootWindowController* root1,
                         RootWindowController* root2) {
   return root1->GetWindow()->GetDisplayNearestWindow().id() <
          root2->GetWindow()->GetDisplayNearestWindow().id();
 }
 
 }  // namespace
 
+// static
+Config AshTestHelper::config_ = Config::CLASSIC;
+
 AshTestHelper::AshTestHelper(AshTestEnvironment* ash_test_environment)
     : ash_test_environment_(ash_test_environment),
       test_shell_delegate_(nullptr),
       test_screenshot_delegate_(nullptr),
       dbus_thread_manager_initialized_(false),
       bluez_dbus_manager_initialized_(false) {
   ui::test::EnableTestConfigForPlatformWindows();
   aura::test::InitializeAuraEventGeneratorDelegate();
 }
 
 AshTestHelper::~AshTestHelper() {}
 
 void AshTestHelper::SetUp(bool start_session) {
   display::ResetDisplayIdForTest();
-  const bool is_mash = IsMash();
-  if (is_mash)
+  if (config_ != Config::CLASSIC)
     aura::test::EnvTestHelper().SetAlwaysUseLastMouseLocation(true);
   // WindowManager creates WMState for mash.
-  if (!is_mash)
+  if (config_ == Config::CLASSIC)
     wm_state_ = base::MakeUnique<::wm::WMState>();
   views_delegate_ = ash_test_environment_->CreateViewsDelegate();
 
   // Disable animations during tests.
   zero_duration_mode_.reset(new ui::ScopedAnimationDurationScaleMode(
       ui::ScopedAnimationDurationScaleMode::ZERO_DURATION));
   ui::InitializeInputMethodForTesting();
 
   // Creates Shell and hook with Desktop.
   if (!test_shell_delegate_)
     test_shell_delegate_ = new TestShellDelegate;
 
-  if (!is_mash) {
+  if (config_ == Config::CLASSIC) {
     // All of this initialization is done in WindowManagerApplication for mash.
 
     // Creates MessageCenter since g_browser_process is not created in
     // AshTestBase tests.
     message_center::MessageCenter::Initialize();
 
     if (!chromeos::DBusThreadManager::IsInitialized()) {
       chromeos::DBusThreadManager::Initialize(
           chromeos::DBusThreadManager::PROCESS_ASH);
       dbus_thread_manager_initialized_ = true;
@@ skipping 14 matching lines @@
   ash_test_environment_->SetUp();
   // Reset the global state for the cursor manager. This includes the
   // last cursor visibility state, etc.
   ::wm::CursorManager::ResetCursorVisibilityStateForTest();
 
   // ContentTestSuiteBase might have already initialized
   // MaterialDesignController in unit_tests suite.
   ui::test::MaterialDesignControllerTestAPI::Uninitialize();
   ui::MaterialDesignController::Initialize();
 
-  if (is_mash)
+  if (config_ != Config::CLASSIC)
     CreateMashWindowManager();
   else
     CreateShell();
 
   aura::test::EnvTestHelper().SetInputStateLookup(
       std::unique_ptr<aura::InputStateLookup>());
 
   session_controller_client_.reset(
       new TestSessionControllerClient(Shell::Get()->session_controller()));
   session_controller_client_->InitializeAndBind();
 
   Shell* shell = Shell::GetInstance();
   if (start_session)
     session_controller_client_->CreatePredefinedUserSessions(1);
 
-  if (!is_mash) {
+  if (config_ == Config::CLASSIC) {
     // ScreenLayoutObserver is specific to classic-ash.
     // 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::GetInstance()->display_manager())
         .DisableChangeDisplayUponHostResize();
     DisplayConfigurationControllerTestApi(
         shell->display_configuration_controller())
         .DisableDisplayAnimator();
 
     // TODO: disabled for mash as AcceleratorControllerDelegateAura isn't
     // created in mash http://crbug.com/632111.
     test_screenshot_delegate_ = new TestScreenshotDelegate();
     WmShellAura::Get()
         ->accelerator_controller_delegate()
         ->SetScreenshotDelegate(
             std::unique_ptr<ScreenshotDelegate>(test_screenshot_delegate_));
+  } else if (config_ == Config::MUS) {
+    test_screenshot_delegate_ = new TestScreenshotDelegate();
+    mus::WmShellMus::Get()
+        ->accelerator_controller_delegate_mus()
+        ->SetScreenshotDelegate(
+            std::unique_ptr<ScreenshotDelegate>(test_screenshot_delegate_));
   }
 }
 
 void AshTestHelper::TearDown() {
   window_manager_app_.reset();
 
-  const bool is_mash = IsMash();
-
   // WindowManger owns the Shell in mash.
-  if (!is_mash)
+  if (config_ == Config::CLASSIC)
     Shell::DeleteInstance();
 
   // Suspend the tear down until all resources are returned via
   // MojoCompositorFrameSinkClient::ReclaimResources()
   RunAllPendingInMessageLoop();
   ash_test_environment_->TearDown();
 
   test_screenshot_delegate_ = NULL;
 
-  if (!is_mash) {
+  if (config_ == Config::CLASSIC) {
     // Remove global message center state.
     message_center::MessageCenter::Shutdown();
 
     chromeos::CrasAudioHandler::Shutdown();
   }
 
   if (bluez_dbus_manager_initialized_) {
     device::BluetoothAdapterFactory::Shutdown();
     bluez::BluezDBusManager::Shutdown();
     bluez_dbus_manager_initialized_ = false;
   }
 
   if (dbus_thread_manager_initialized_) {
     chromeos::DBusThreadManager::Shutdown();
     dbus_thread_manager_initialized_ = false;
   }
 
   ui::TerminateContextFactoryForTests();
 
   ui::ShutdownInputMethodForTesting();
   zero_duration_mode_.reset();
 
   views_delegate_.reset();
   wm_state_.reset();
 
-  // WindowManager owns the CaptureController for mash.
-  CHECK(is_mash || !::wm::CaptureController::Get());
+  // WindowManager owns the CaptureController for mus/mash.
+  CHECK(config_ != Config::CLASSIC || !::wm::CaptureController::Get());
 }
 
 void AshTestHelper::RunAllPendingInMessageLoop() {
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
 }
 
 // static
 TestSessionStateDelegate* AshTestHelper::GetTestSessionStateDelegate() {
   CHECK(WmShell::HasInstance());
@@ skipping 10 matching lines @@
 }
 
 void AshTestHelper::UpdateDisplayForMash(const std::string& display_spec) {
   // TODO(erg): This is not equivalent to display::DisplayManager::
   // UpdateDisplaysWith(). This does not calculate all the internal metric
   // changes, does not calculate focus changes and does not dispatch to all the
   // observers in ash which want to be notified about the previous two.
   //
   // Once this is fixed, RootWindowControllerTest.MoveWindows_Basic, among
   // other unit tests, should work. http://crbug.com/695632.
-  CHECK(IsMash());
+  CHECK(config_ != Config::CLASSIC);
   const std::vector<std::string> parts = base::SplitString(
       display_spec, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   std::vector<RootWindowController*> root_window_controllers =
       GetRootsOrderedByDisplayId();
   int next_x = 0;
   for (size_t i = 0,
               end = std::min(parts.size(), root_window_controllers.size());
        i < end; ++i) {
     UpdateDisplay(root_window_controllers[i], parts[i], &next_x);
   }
   for (size_t i = root_window_controllers.size(); i < parts.size(); ++i) {
     root_window_controllers.push_back(
         CreateRootWindowController(parts[i], &next_x));
   }
   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 (!IsMash())
+  if (config_ == Config::CLASSIC)
     return Shell::GetInstance()->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(IsMash());
+  CHECK(config_ != Config::CLASSIC);
   window_manager_app_ = base::MakeUnique<mus::WindowManagerApplication>();
 
   window_manager_app_->window_manager_.reset(
-      new mus::WindowManager(nullptr, Config::MASH));
+      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());
@@ skipping 11 matching lines @@
       base::MakeUnique<aura::WindowTreeClientPrivate>(window_tree_client);
   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(!IsMash());
+  CHECK(config_ == Config::CLASSIC);
   ui::ContextFactory* context_factory = nullptr;
   ui::ContextFactoryPrivate* context_factory_private = nullptr;
   bool enable_pixel_output = false;
   ui::InitializeContextFactoryForTests(enable_pixel_output, &context_factory,
                                        &context_factory_private);
   ShellInitParams init_params;
   init_params.delegate = test_shell_delegate_;
   init_params.context_factory = context_factory;
   init_params.context_factory_private = context_factory_private;
   init_params.blocking_pool = ash_test_environment_->GetBlockingPool();
@@ skipping 40 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