chromeos: get OobeDisplayChooserTest tests working for mus

These tests used DeviceDataManager directly, which doesn't work for
mus. The fix is to use InputDeviceClientTestApi. PreferTouchAsPrimary
required an additional call because unit tests don't really bring up
mus.

BUG=776514
TEST=test only changes

Change-Id: Ica853e72d97bada225004bda7d30b507cef4cab0
Reviewed-on: https://chromium-review.googlesource.com/847688
Commit-Queue: Scott Violet <sky@chromium.org>
Reviewed-by: kylechar <kylechar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#526556}

chrome/browser/ui/webui/chromeos/login/oobe_display_chooser_unittest.cc

@@ -11,6 +11,7 @@
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/run_loop.h"
+#include "services/ui/public/cpp/input_devices/input_device_client_test_api.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/display/display.h"
 #include "ui/display/display_observer.h"
@@ -18,7 +19,6 @@
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/screen.h"
 #include "ui/display/test/display_manager_test_api.h"
-#include "ui/events/devices/device_data_manager.h"
 #include "ui/events/devices/touchscreen_device.h"
 
 namespace chromeos {
@@ -33,20 +33,10 @@ class OobeDisplayChooserTest : public ash::AshTestBase {
     return display::Screen::GetScreen()->GetPrimaryDisplay().id();
   }
 
-  void UpdateTouchscreenDevices(const ui::TouchscreenDevice& touchscreen) {
-    std::vector<ui::TouchscreenDevice> devices{touchscreen};
-
-    ui::DeviceHotplugEventObserver* manager =
-        ui::DeviceDataManager::GetInstance();
-    manager->OnTouchscreenDevicesUpdated(devices);
-  }
-
   // ash::AshTestBase:
   void SetUp() override {
     ash::AshTestBase::SetUp();
-    static_cast<ui::DeviceHotplugEventObserver*>(
-        ui::DeviceDataManager::GetInstance())
-        ->OnDeviceListsComplete();
+    ui::InputDeviceClientTestApi().OnDeviceListsComplete();
   }
 
  private:
@@ -75,7 +65,7 @@ TEST_F(OobeDisplayChooserTest, PreferTouchAsPrimary) {
       ui::TouchscreenDevice(1, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL,
                             "Touchscreen", gfx::Size(800, 600), 1);
   touchscreen.vendor_id = kWhitelistedId;
-  UpdateTouchscreenDevices(touchscreen);
+  ui::InputDeviceClientTestApi().SetTouchscreenDevices({touchscreen});
   base::RunLoop().RunUntilIdle();
 
   // Associate touchscreen device with display
@@ -85,6 +75,14 @@ TEST_F(OobeDisplayChooserTest, PreferTouchAsPrimary) {
   display_manager()->OnNativeDisplaysChanged(display_info);
   base::RunLoop().RunUntilIdle();
 
+  // For mus we have to explicitly tell the InputDeviceClient the
+  // TouchscreenDevices. Normally InputDeviceClient is told of the
+  // TouchscreenDevices by way of implementing
+  // ui::mojom::InputDeviceObserverMojo. In unit tests InputDeviceClient is not
+  // wired to the window server (the window server isn't running).
+  touchscreen.target_display_id = display_info[1].id();
+  ui::InputDeviceClientTestApi().SetTouchscreenDevices({touchscreen}, true);
+
   OobeDisplayChooser display_chooser;
   EXPECT_EQ(1, GetPrimaryDisplay());
   display_chooser.TryToPlaceUiOnTouchDisplay();
@@ -111,7 +109,7 @@ TEST_F(OobeDisplayChooserTest, DontSwitchFromTouch) {
       ui::TouchscreenDevice(1, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL,
                             "Touchscreen", gfx::Size(800, 600), 1);
   touchscreen.vendor_id = kWhitelistedId;
-  UpdateTouchscreenDevices(touchscreen);
+  ui::InputDeviceClientTestApi().SetTouchscreenDevices({touchscreen});
   base::RunLoop().RunUntilIdle();
 
   // Associate touchscreen device with display

services/ui/public/cpp/input_devices/input_device_client_test_api.cc

@@ -69,12 +69,13 @@ void InputDeviceClientTestApi::SetKeyboardDevices(
 }
 
 void InputDeviceClientTestApi::SetTouchscreenDevices(
-    const std::vector<TouchscreenDevice>& devices) {
+    const std::vector<TouchscreenDevice>& devices,
+    bool are_touchscreen_target_displays_valid) {
   if (DeviceDataManager::instance_) {
     DeviceDataManager::instance_->OnTouchscreenDevicesUpdated(devices);
   } else {
-    GetInputDeviceClient()->OnTouchscreenDeviceConfigurationChanged(devices,
-                                                                    false);
+    GetInputDeviceClient()->OnTouchscreenDeviceConfigurationChanged(
+        devices, are_touchscreen_target_displays_valid);
   }
 }
 

services/ui/public/cpp/input_devices/input_device_client_test_api.h

@@ -37,7 +37,13 @@ class InputDeviceClientTestApi {
   void OnDeviceListsComplete();
 
   void SetKeyboardDevices(const std::vector<InputDevice>& devices);
-  void SetTouchscreenDevices(const std::vector<TouchscreenDevice>& devices);
+
+  // |are_touchscreen_target_displays_valid| is only applicable to
+  // InputDeviceClient. See
+  // InputDeviceClient::OnTouchscreenDeviceConfigurationChanged() for details.
+  void SetTouchscreenDevices(
+      const std::vector<TouchscreenDevice>& devices,
+      bool are_touchscreen_target_displays_valid = false);
 
   InputDeviceClient* GetInputDeviceClient();