Move touch CTM from X into Chrome

ui/events/x/events_x_unittest.cc

Index: ui/events/x/events_x_unittest.cc
diff --git a/ui/events/x/events_x_unittest.cc b/ui/events/x/events_x_unittest.cc
index 368682cbb1bd5fec0bb896ada960ac5c5ea5aa92..e62a409c81761313dafc2518aa626c1bb4b06a9a 100644
--- a/ui/events/x/events_x_unittest.cc
+++ b/ui/events/x/events_x_unittest.cc
@@ -189,6 +189,7 @@ TEST(EventsXTest, TouchEventBasic) {
   devices.push_back(0);
   ui::SetUpTouchDevicesForTest(devices);
   std::vector<Valuator> valuators;
+  ::Window target = DefaultRootWindow(gfx::GetXDisplay());
 
   // Init touch begin with tracking id 5, touch id 0.
   valuators.push_back(Valuator(DeviceDataManager::DT_TOUCH_MAJOR, 20));
@@ -196,7 +197,7 @@ TEST(EventsXTest, TouchEventBasic) {
   valuators.push_back(Valuator(DeviceDataManager::DT_TOUCH_PRESSURE, 100));
   ui::ScopedXI2Event scoped_xevent;
   scoped_xevent.InitTouchEvent(
-      0, XI_TouchBegin, 5, gfx::Point(10, 10), valuators);
+      0, XI_TouchBegin, 5, gfx::Point(10, 10), valuators, target);
   EXPECT_EQ(ui::ET_TOUCH_PRESSED, ui::EventTypeFromNative(scoped_xevent));
   EXPECT_EQ("10,10", ui::EventLocationFromNative(scoped_xevent).ToString());
   EXPECT_EQ(GetTouchId(scoped_xevent), 0);
@@ -208,7 +209,7 @@ TEST(EventsXTest, TouchEventBasic) {
   valuators.clear();
   valuators.push_back(Valuator(DeviceDataManager::DT_TOUCH_ORIENTATION, 0.5f));
   scoped_xevent.InitTouchEvent(
-      0, XI_TouchUpdate, 5, gfx::Point(20, 20), valuators);
+      0, XI_TouchUpdate, 5, gfx::Point(20, 20), valuators, target);
   EXPECT_EQ(ui::ET_TOUCH_MOVED, ui::EventTypeFromNative(scoped_xevent));
   EXPECT_EQ("20,20", ui::EventLocationFromNative(scoped_xevent).ToString());
   EXPECT_EQ(GetTouchId(scoped_xevent), 0);
@@ -222,7 +223,7 @@ TEST(EventsXTest, TouchEventBasic) {
   valuators.push_back(Valuator(DeviceDataManager::DT_TOUCH_ORIENTATION, 0.9f));
   valuators.push_back(Valuator(DeviceDataManager::DT_TOUCH_PRESSURE, 500));
   scoped_xevent.InitTouchEvent(
-      0, XI_TouchBegin, 6, gfx::Point(200, 200), valuators);
+      0, XI_TouchBegin, 6, gfx::Point(200, 200), valuators, target);
   EXPECT_EQ(ui::ET_TOUCH_PRESSED, ui::EventTypeFromNative(scoped_xevent));
   EXPECT_EQ("200,200", ui::EventLocationFromNative(scoped_xevent).ToString());
   EXPECT_EQ(GetTouchId(scoped_xevent), 1);
@@ -235,7 +236,7 @@ TEST(EventsXTest, TouchEventBasic) {
   valuators.clear();
   valuators.push_back(Valuator(DeviceDataManager::DT_TOUCH_PRESSURE, 50));
   scoped_xevent.InitTouchEvent(
-      0, XI_TouchEnd, 5, gfx::Point(30, 30), valuators);
+      0, XI_TouchEnd, 5, gfx::Point(30, 30), valuators, target);
   EXPECT_EQ(ui::ET_TOUCH_RELEASED, ui::EventTypeFromNative(scoped_xevent));
   EXPECT_EQ("30,30", ui::EventLocationFromNative(scoped_xevent).ToString());
   EXPECT_EQ(GetTouchId(scoped_xevent), 0);
@@ -248,7 +249,7 @@ TEST(EventsXTest, TouchEventBasic) {
   valuators.clear();
   valuators.push_back(Valuator(DeviceDataManager::DT_TOUCH_MAJOR, 50));
   scoped_xevent.InitTouchEvent(
-      0, XI_TouchEnd, 6, gfx::Point(200, 200), valuators);
+      0, XI_TouchEnd, 6, gfx::Point(200, 200), valuators, target);
   EXPECT_EQ(ui::ET_TOUCH_RELEASED, ui::EventTypeFromNative(scoped_xevent));
   EXPECT_EQ("200,200", ui::EventLocationFromNative(scoped_xevent).ToString());
   EXPECT_EQ(GetTouchId(scoped_xevent), 1);