Merge 270252 "Re-land "Move touch CTM from X into Chrome""

ui/events/test/events_test_utils_x11.cc

 // Copyright 2013 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/test/events_test_utils_x11.h"
 
 #include <X11/extensions/XI2.h>
 #include <X11/keysym.h>
 #include <X11/X.h>
 #include <X11/Xlib.h>
@@ skipping 91 matching lines @@
   event->xcookie.data = new XIDeviceEvent;
   XIDeviceEvent* xiev =
       static_cast<XIDeviceEvent*>(event->xcookie.data);
   memset(xiev, 0, sizeof(XIDeviceEvent));
   xiev->deviceid = deviceid;
   xiev->sourceid = deviceid;
   xiev->evtype = evtype;
   xiev->detail = tracking_id;
   xiev->event_x = location.x();
   xiev->event_y = location.y();
+  xiev->event = DefaultRootWindow(gfx::GetXDisplay());
   if (evtype == XI_ButtonPress || evtype == XI_ButtonRelease) {
     xiev->buttons.mask_len = 8;
     xiev->buttons.mask = new unsigned char[xiev->buttons.mask_len];
     memset(xiev->buttons.mask, 0, xiev->buttons.mask_len);
   }
   return event;
 }
 
 }  // namespace
 
@@ skipping 135 matching lines @@
   manager->SetDeviceListForTest(std::vector<unsigned int>(), device_list);
 }
 
 void SetUpTouchDevicesForTest(const std::vector<unsigned int>& devices) {
   TouchFactory::GetInstance()->SetTouchDeviceForTest(devices);
   ui::DeviceDataManager* manager = ui::DeviceDataManager::GetInstance();
   manager->SetDeviceListForTest(devices, std::vector<unsigned int>());
 }
 
 }  // namespace ui