Adds special support to the device manager for keyboards devices.

ui/events/x/device_data_manager_x11_unittest.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 "ui/events/x/device_data_manager_x11.h"
+
+#include <vector>
+
+// Generically-named #defines from Xlib that conflict with symbols in GTest.
+#undef Bool
+#undef None
+
+#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/events/device_hotplug_event_observer.h"
+#include "ui/events/input_device.h"
+#include "ui/events/input_device_event_observer.h"
+#include "ui/events/keyboard_device.h"
+#include "ui/events/touchscreen_device.h"
+
+namespace ui {
+namespace test {
+namespace {
+
+class TestInputDeviceObserver : public InputDeviceEventObserver {
+ public:
+  explicit TestInputDeviceObserver(DeviceDataManagerX11* manager)
+      : manager_(manager),
+        change_notified_(false) {
+    if (manager_)
+      manager_->AddObserver(this);
+  }
+
+  virtual ~TestInputDeviceObserver() {
+    if (manager_)
+      manager_->RemoveObserver(this);
+  }
+
+  // InputDeviceEventObserver implementation.
+  virtual void OnTouchscreenDeviceConfigurationChanged() override {}
+  virtual void OnKeyboardDeviceConfigurationChanged() override {
+    change_notified_ = true;
+  }
+
+  int change_notified() const { return change_notified_; }
+  void Reset() { change_notified_ = false; }
+
+ private:
+  DeviceDataManager* manager_;
+  bool change_notified_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestInputDeviceObserver);
+};
+
+}  //  namespace
+
+class DeviceDataManagerX11Test : public testing::Test {
+ public:
+  DeviceDataManagerX11Test() {}
+  virtual ~DeviceDataManagerX11Test() {}
+
+  void SetUp() override {
+    DeviceDataManagerX11::CreateInstance();
+  }
+
+  virtual void SetKeyboardDevices(const std::vector<KeyboardDevice>& devices) {
+    DeviceHotplugEventObserver* manager = DeviceDataManagerX11::GetInstance();
+    manager->OnKeyboardDevicesUpdated(devices);
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(DeviceDataManagerX11Test);
+};
+
+// Tests that the the device data manager notifies observers when a device is
+// disabled and re-enabled.
+TEST_F(DeviceDataManagerX11Test, NotifyOnDisable) {
+  DeviceDataManagerX11* manager = DeviceDataManagerX11::GetInstance();
+  TestInputDeviceObserver observer(manager);
+  std::vector<ui::KeyboardDevice> keyboards;
+  keyboards.push_back(ui::KeyboardDevice(1, ui::InputDeviceType::INTERNAL,
+    "Keyboard"));
+  keyboards.push_back(ui::KeyboardDevice(2, ui::InputDeviceType::INTERNAL,
+    "Keyboard"));
+  SetKeyboardDevices(keyboards);
+  EXPECT_TRUE(observer.change_notified());
+  std::vector<KeyboardDevice> devices = manager->keyboard_devices();
+  EXPECT_EQ(keyboards.size(), devices.size());
+  observer.Reset();
+
+  manager->DisableDevice(2);
+  EXPECT_TRUE(observer.change_notified());
+  devices = manager->keyboard_devices();
+  unsigned long expected_size = 1;
+  EXPECT_EQ(expected_size, devices.size());

[flackr, 2014/10/08 21:58:11]

EXPECT_EQ(1u, devices.size());

[rsadam, 2014/10/09 05:19:03]

Done.

+  KeyboardDevice device = devices.front();
+  EXPECT_EQ(1, device.id);
+  observer.Reset();
+
+  manager->EnableDevice(2);
+  EXPECT_TRUE(observer.change_notified());
+  devices = manager->keyboard_devices();
+  EXPECT_EQ(keyboards.size(), devices.size());
+}
+
+}  // namespace test
+}  // namespace ui