Revert of Fix test for master device.

ui/events/test/events_test_utils_x11.h

 // 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.
 
 #ifndef UI_EVENTS_TEST_EVENTS_TEST_UTILS_X11_H_
 #define UI_EVENTS_TEST_EVENTS_TEST_UTILS_X11_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/keycodes/keyboard_codes.h"
@@ skipping 24 matching lines @@
 
   operator XEvent*() { return event_.get(); }
 
   // Initializes a XEvent with for the appropriate type with the specified data.
   // Note that ui::EF_ flags should be passed as |flags|, not the native ones in
   // <X11/X.h>.
   void InitKeyEvent(EventType type,
                     KeyboardCode key_code,
                     int flags);
 
-  // Initializes an Xinput2 key event.
-  // |deviceid| is the master, and |sourceid| is the slave device.
   void InitGenericKeyEvent(int deviceid,
-                           int sourceid,
                            EventType type,
                            KeyboardCode key_code,
                            int flags);
 
   void InitGenericButtonEvent(int deviceid,
                               EventType type,
                               const gfx::Point& location,
                               int flags);
 
   void InitGenericMouseWheelEvent(int deviceid,
@@ skipping 32 matching lines @@
 
 // Initializes a test touchpad device for scroll events.
 void SetUpTouchPadForTest(unsigned int deviceid);
 
 // Initializes a list of touchscreen devices for touch events.
 void SetUpTouchDevicesForTest(const std::vector<unsigned int>& devices);
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_TEST_EVENTS_TEST_UTILS_X11_H_