x11: Always require XI2.2 for X11.

ui/events/x/events_x_unittest.cc

 // Copyright (c) 2012 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 <cstring>
 #include <set>
 
 #include <X11/extensions/XInput2.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ skipping 197 matching lines @@
 
     InitButtonEvent(&event, false, location, 1, 0);
     {
       MouseEvent mouseev(&event);
       EXPECT_EQ(ui::ET_MOUSE_RELEASED, mouseev.type());
       EXPECT_EQ(i, mouseev.GetClickCount());
     }
   }
 }
 
-#if defined(USE_XI2_MT)
 TEST_F(EventsXTest, TouchEventBasic) {
   std::vector<unsigned int> devices;
   devices.push_back(0);
   ui::SetUpTouchDevicesForTest(devices);
   std::vector<Valuator> valuators;
 
   // Init touch begin with tracking id 5, touch id 0.
   valuators.push_back(Valuator(DeviceDataManagerX11::DT_TOUCH_MAJOR, 20));
   valuators.push_back(
       Valuator(DeviceDataManagerX11::DT_TOUCH_ORIENTATION, 0.3f));
@@ skipping 114 matching lines @@
   EXPECT_EQ(-1, GetTouchIdForTrackingId(kTrackingId1));
 
   // This should clear the touch id of the first touch.
   ui::ScopedXI2Event xrelease0;
   xrelease0.InitTouchEvent(
       0, XI_TouchEnd, kTrackingId0, gfx::Point(10, 10), valuators);
   scoped_ptr<ui::TouchEvent> urelease0(new ui::TouchEvent(xrelease0));
   urelease0.reset();
   EXPECT_EQ(-1, GetTouchIdForTrackingId(kTrackingId0));
 }
-#endif
 
 TEST_F(EventsXTest, NumpadKeyEvents) {
   XEvent event;
   Display* display = gfx::GetXDisplay();
 
   struct {
     bool is_numpad_key;
     int x_keysym;
   } keys[] = {
     // XK_KP_Space and XK_KP_Equal are the extrema in the conventional
@@ skipping 137 matching lines @@
   EXPECT_TRUE(HasFunctionKeyFlagSetIfSupported(display, XK_F30));
   EXPECT_TRUE(HasFunctionKeyFlagSetIfSupported(display, XK_F31));
   EXPECT_TRUE(HasFunctionKeyFlagSetIfSupported(display, XK_F32));
   EXPECT_TRUE(HasFunctionKeyFlagSetIfSupported(display, XK_F33));
   EXPECT_TRUE(HasFunctionKeyFlagSetIfSupported(display, XK_F34));
   EXPECT_TRUE(HasFunctionKeyFlagSetIfSupported(display, XK_F35));
   // Max function key code plus 1.
   EXPECT_FALSE(HasFunctionKeyFlagSetIfSupported(display, XK_F35 + 1));
 }
 
-#if defined(USE_XI2_MT)
 // Verifies that the type of events from a disabled keyboard is ET_UNKNOWN, but
 // that an exception list of keys can still be processed.
 TEST_F(EventsXTest, DisableKeyboard) {
   DeviceDataManagerX11* device_data_manager =
       static_cast<DeviceDataManagerX11*>(
           DeviceDataManager::GetInstance());
   unsigned int blocked_device_id = 1;
   unsigned int other_device_id = 2;
   unsigned int master_device_id = 3;
   device_data_manager->DisableDevice(blocked_device_id);
@@ skipping 68 matching lines @@
   xev.InitGenericButtonEvent(other_device_id, ET_MOUSE_PRESSED, gfx::Point(),
       EF_LEFT_MOUSE_BUTTON);
   EXPECT_EQ(ui::ET_MOUSE_PRESSED, ui::EventTypeFromNative(xev));
 
   device_data_manager->EnableDevice(blocked_device_id);
 
   xev.InitGenericButtonEvent(blocked_device_id, ET_MOUSE_PRESSED, gfx::Point(),
       EF_LEFT_MOUSE_BUTTON);
   EXPECT_EQ(ui::ET_MOUSE_PRESSED, ui::EventTypeFromNative(xev));
 }
-#endif  // defined(USE_XI2_MT)
 
 #if !defined(OS_CHROMEOS)
 TEST_F(EventsXTest, ImeFabricatedKeyEvents) {
   Display* display = gfx::GetXDisplay();
 
   unsigned int state_to_be_fabricated[] = {
     0, ShiftMask, LockMask, ShiftMask | LockMask,
   };
   for (size_t i = 0; i < arraysize(state_to_be_fabricated); ++i) {
     unsigned int state = state_to_be_fabricated[i];
@@ skipping 22 matching lines @@
         KeyEventTestApi test_event(&key_event);
         test_event.set_is_char(true);
       }
       EXPECT_FALSE(key_event.flags() & ui::EF_IME_FABRICATED_KEY);
     }
   }
 }
 #endif
 
 }  // namespace ui