Wires up InputDeviceClient for mash/mushrome

ash/mus/test/wm_test_helper.cc

 // Copyright 2016 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/mus/test/wm_test_helper.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/test/test_shell_delegate.h"
 #include "ash/wm_window.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/test/sequenced_worker_pool_owner.h"
+#include "services/ui/public/cpp/input_devices/input_device_client.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/test/env_test_helper.h"
 #include "ui/aura/test/mus/window_tree_client_private.h"
 #include "ui/aura/window.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/test/material_design_controller_test_api.h"
 #include "ui/display/display.h"
 #include "ui/display/display_list.h"
 #include "ui/display/screen_base.h"
@@ skipping 45 matching lines @@
 
 WmTestHelper::~WmTestHelper() {
   // Needs to be destroyed before material design.
   window_manager_app_.reset();
 
   base::RunLoop().RunUntilIdle();
   blocking_pool_owner_.reset();
   base::RunLoop().RunUntilIdle();
 
   ui::test::MaterialDesignControllerTestAPI::Uninitialize();
+
+  input_device_client_.reset();
 }
 
 void WmTestHelper::Init() {
+  const Config config = base::CommandLine::ForCurrentProcess()->HasSwitch("mus")
+                            ? Config::MUS
+                            : Config::MASH;
+  if (config == Config::MUS)
+    input_device_client_ = base::MakeUnique<ui::InputDeviceClient>();
+
   // MaterialDesignController may have already been initialized. To cover that
   // case explicitly uninitialize before initializing.
   ui::test::MaterialDesignControllerTestAPI::Uninitialize();
   ui::MaterialDesignController::Initialize();
 
   views_delegate_ = base::MakeUnique<views::TestViewsDelegate>();
 
   window_manager_app_ = base::MakeUnique<WindowManagerApplication>();
 
   message_loop_.reset(new base::MessageLoopForUI());
 
   const size_t kMaxNumberThreads = 3u;  // Matches that of content.
   const char kThreadNamePrefix[] = "MashBlockingForTesting";
   blocking_pool_owner_ = base::MakeUnique<base::SequencedWorkerPoolOwner>(
       kMaxNumberThreads, kThreadNamePrefix);
 
   window_manager_app_->window_manager_ =
-      base::MakeUnique<WindowManager>(nullptr, Config::MASH);
+      base::MakeUnique<WindowManager>(nullptr, config);
   window_manager_app_->window_manager()->shell_delegate_ =
       base::MakeUnique<test::TestShellDelegate>();
 
   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());
   // See comment in AshTestHelper for details on why NetworkHandler is not
   // initialized.
@@ skipping 74 matching lines @@
   const bool is_primary =
       screen->display_list().FindDisplayById(updated_display.id()) ==
       screen->display_list().GetPrimaryDisplayIterator();
   screen->display_list().UpdateDisplay(
       updated_display, is_primary ? display::DisplayList::Type::PRIMARY
                                   : display::DisplayList::Type::NOT_PRIMARY);
 }
 
 }  // namespace mus
 }  // namespace ash