Use fake Input Device Settings with chrome://device-emulator

chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc

 // Copyright 2014 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 "chrome/browser/chromeos/system/input_device_settings.h"
 
 #include "base/macros.h"
+#include "chrome/browser/chromeos/system/fake_input_device_settings.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/ozone/public/input_controller.h"
 #include "ui/ozone/public/ozone_platform.h"
 
 #if defined(MOJO_SHELL_CLIENT)
 #include "services/shell/runner/common/client_util.h"
 #endif
 
 namespace chromeos {
 namespace system {
 
 namespace {
 
 InputDeviceSettings* g_instance = nullptr;
-InputDeviceSettings* g_test_instance = nullptr;
+FakeInputDeviceSettings* g_test_instance = nullptr;
 
 std::unique_ptr<ui::InputController> CreateStubInputControllerIfNecessary() {
 #if defined(MOJO_SHELL_CLIENT)
   return shell::ShellIsRemote() ? ui::CreateStubInputController() : nullptr;
 #else
   return nullptr;
 #endif
 }
 
 // InputDeviceSettings for Linux without X11 (a.k.a. Ozone).
@@ skipping 130 matching lines @@
 // static
 InputDeviceSettings* InputDeviceSettings::Get() {
   if (g_test_instance)
     return g_test_instance;
   if (!g_instance)
     g_instance = new InputDeviceSettingsImplOzone;
   return g_instance;
 }
 
 // static
+FakeInputDeviceSettings* InputDeviceSettings::GetForTesting() {
+  if (!g_test_instance)
+    g_test_instance = new FakeInputDeviceSettings();
+  return g_test_instance;
+}
+
+// static
 void InputDeviceSettings::SetSettingsForTesting(
-    InputDeviceSettings* test_settings) {
+    FakeInputDeviceSettings* test_settings) {
   if (g_test_instance == test_settings)
     return;
   delete g_test_instance;
   g_test_instance = test_settings;
 }

[stevenjb, 2016/06/30 00:17:30]

So all of this logic should just be in input_device_settings.cc (which means it
has to include the ozone or x11 version based on an #ifdef, but I still think
that's better, and it's consistent with what we do elsewhere), except
InputDeviceSettingsOzone::Get().

 
 }  // namespace system
 }  // namespace chromeos