Adds special support to the device manager for keyboards devices.

ash/touch/touchscreen_util_unittest.cc

Index: ash/touch/touchscreen_util_unittest.cc
diff --git a/ash/touch/touchscreen_util_unittest.cc b/ash/touch/touchscreen_util_unittest.cc
index fd88fc1ad91076bbcadd952f09d5e8adbdf1038e..9cdde508c31138ba7d34150e6493c3e74f3269f4 100644
--- a/ash/touch/touchscreen_util_unittest.cc
+++ b/ash/touch/touchscreen_util_unittest.cc
@@ -2,11 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <string>
 #include <vector>
 
 #include "ash/display/display_info.h"
 #include "ash/touch/touchscreen_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/events/input_device.h"
 
 namespace ash {
 
@@ -76,8 +78,10 @@ TEST_F(TouchscreenUtilTest, NoTouchscreens) {
 
 TEST_F(TouchscreenUtilTest, OneToOneMapping) {
   std::vector<ui::TouchscreenDevice> devices;
-  devices.push_back(ui::TouchscreenDevice(1, gfx::Size(800, 600), false));
-  devices.push_back(ui::TouchscreenDevice(2, gfx::Size(1024, 768), false));
+  devices.push_back(ui::TouchscreenDevice(1, ui::InputDeviceType::EXTERNAL,
+      "", gfx::Size(800, 600)));
+  devices.push_back(ui::TouchscreenDevice(2, ui::InputDeviceType::EXTERNAL,
+      "", gfx::Size(1024, 768)));
 
   AssociateTouchscreens(&displays_, devices);
 
@@ -89,7 +93,8 @@ TEST_F(TouchscreenUtilTest, OneToOneMapping) {
 
 TEST_F(TouchscreenUtilTest, MapToCorrectDisplaySize) {
   std::vector<ui::TouchscreenDevice> devices;
-  devices.push_back(ui::TouchscreenDevice(2, gfx::Size(1024, 768), false));
+  devices.push_back(ui::TouchscreenDevice(2, ui::InputDeviceType::EXTERNAL,
+      "",  gfx::Size(1024, 768)));
 
   AssociateTouchscreens(&displays_, devices);
 
@@ -101,8 +106,10 @@ TEST_F(TouchscreenUtilTest, MapToCorrectDisplaySize) {
 
 TEST_F(TouchscreenUtilTest, MapWhenSizeDiffersByOne) {
   std::vector<ui::TouchscreenDevice> devices;
-  devices.push_back(ui::TouchscreenDevice(1, gfx::Size(801, 600), false));
-  devices.push_back(ui::TouchscreenDevice(2, gfx::Size(1023, 768), false));
+  devices.push_back(ui::TouchscreenDevice(1, ui::InputDeviceType::EXTERNAL,
+      "",  gfx::Size(801, 600)));
+  devices.push_back(ui::TouchscreenDevice(2, ui::InputDeviceType::EXTERNAL,
+      "", gfx::Size(1023, 768)));
 
   AssociateTouchscreens(&displays_, devices);
 
@@ -114,8 +121,10 @@ TEST_F(TouchscreenUtilTest, MapWhenSizeDiffersByOne) {
 
 TEST_F(TouchscreenUtilTest, MapWhenSizesDoNotMatch) {
   std::vector<ui::TouchscreenDevice> devices;
-  devices.push_back(ui::TouchscreenDevice(1, gfx::Size(1022, 768), false));
-  devices.push_back(ui::TouchscreenDevice(2, gfx::Size(802, 600), false));
+  devices.push_back(ui::TouchscreenDevice(1, ui::InputDeviceType::EXTERNAL,
+      "", gfx::Size(1022, 768)));
+  devices.push_back(ui::TouchscreenDevice(2, ui::InputDeviceType::EXTERNAL,
+      "", gfx::Size(802, 600)));
 
   AssociateTouchscreens(&displays_, devices);
 
@@ -127,8 +136,10 @@ TEST_F(TouchscreenUtilTest, MapWhenSizesDoNotMatch) {
 
 TEST_F(TouchscreenUtilTest, MapInternalTouchscreen) {
   std::vector<ui::TouchscreenDevice> devices;
-  devices.push_back(ui::TouchscreenDevice(1, gfx::Size(1920, 1080), false));
-  devices.push_back(ui::TouchscreenDevice(2, gfx::Size(9999, 888), true));
+  devices.push_back(ui::TouchscreenDevice(1, ui::InputDeviceType::EXTERNAL,
+      "", gfx::Size(1920, 1080)));
+  devices.push_back(ui::TouchscreenDevice(2, ui::InputDeviceType::INTERNAL,
+      "",  gfx::Size(9999, 888)));
 
   AssociateTouchscreens(&displays_, devices);