Revert of Fix test for master device.

chrome/browser/chromeos/events/event_rewriter_unittest.cc

 // Copyright 2014 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 "chrome/browser/chromeos/events/event_rewriter.h"
 
 #include <vector>
 
 #include "ash/shell.h"
 #include "ash/sticky_keys/sticky_keys_controller.h"
@@ skipping 28 matching lines @@
 #include "ui/events/test/events_test_utils_x11.h"
 #include "ui/events/x/touch_factory_x11.h"
 #include "ui/gfx/x/x11_types.h"
 #endif
 
 namespace {
 
 // The device id of the test touchpad device.
 const unsigned int kTouchPadDeviceId = 1;
 const int kKeyboardDeviceId = 2;
-const int kMasterKeyboardDeviceId = 3;
 
 std::string GetExpectedResultAsString(ui::KeyboardCode ui_keycode,
                                       int ui_flags,
                                       ui::EventType ui_type) {
   return base::StringPrintf("ui_keycode=0x%X ui_flags=0x%X ui_type=%d",
                             ui_keycode,
                             ui_flags & ~ui::EF_IS_REPEAT,
                             ui_type);
 }
 
@@ skipping 84 matching lines @@
 #if defined(USE_X11)
   if (test.test & KeyTestCase::TEST_X11) {
     ui::ScopedXI2Event xev;
     // Test an XKeyEvent.
     xev.InitKeyEvent(test.type, test.input.key_code, test.input.flags);
     XEvent* xevent = xev;
     DCHECK((xevent->type == KeyPress) || (xevent->type == KeyRelease));
     if (xevent->xkey.keycode)
       CheckX11KeyTestCase(expected, rewriter, test, xevent);
     // Test an XI2 GenericEvent.
-    xev.InitGenericKeyEvent(kMasterKeyboardDeviceId,
-                            kKeyboardDeviceId,
-                            test.type,
-                            test.input.key_code,
-                            test.input.flags);
+    xev.InitGenericKeyEvent(
+        kKeyboardDeviceId, test.type, test.input.key_code, test.input.flags);
     xevent = xev;
     DCHECK(xevent->type == GenericEvent);
     XIDeviceEvent* xievent = static_cast<XIDeviceEvent*>(xevent->xcookie.data);
     DCHECK((xievent->evtype == XI_KeyPress) ||
            (xievent->evtype == XI_KeyRelease));
     if (xievent->detail)
       CheckX11KeyTestCase(expected, rewriter, test, xevent);
   }
 #endif
 }
@@ skipping 2309 matching lines @@
   EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_ALTGR_DOWN));
   EXPECT_TRUE(overlay_->GetModifierVisible(ui::EF_MOD3_DOWN));
 
   // Turn off AltGr and Mod3.
   sticky_keys_controller_->SetModifiersEnabled(false, false);
   EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_ALTGR_DOWN));
   EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_MOD3_DOWN));
 }
 
 }  // namespace chromeos