Fix test for master device.

chrome/browser/chromeos/events/event_rewriter_unittest.cc

Index: chrome/browser/chromeos/events/event_rewriter_unittest.cc
diff --git a/chrome/browser/chromeos/events/event_rewriter_unittest.cc b/chrome/browser/chromeos/events/event_rewriter_unittest.cc
index db71419e5e674a23f0afe56fecc51bd3575f03b2..261c837aa66de6406ae132c9b1ee2fbcc3f40095 100644
--- a/chrome/browser/chromeos/events/event_rewriter_unittest.cc
+++ b/chrome/browser/chromeos/events/event_rewriter_unittest.cc
@@ -46,6 +46,7 @@ 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,
@@ -150,8 +151,11 @@ void CheckKeyTestCase(chromeos::EventRewriter* rewriter,
     if (xevent->xkey.keycode)
       CheckX11KeyTestCase(expected, rewriter, test, xevent);
     // Test an XI2 GenericEvent.
-    xev.InitGenericKeyEvent(
-        kKeyboardDeviceId, test.type, test.input.key_code, test.input.flags);
+    xev.InitGenericKeyEvent(kMasterKeyboardDeviceId,
+                            kKeyboardDeviceId,
+                            test.type,
+                            test.input.key_code,
+                            test.input.flags);
     xevent = xev;
     DCHECK(xevent->type == GenericEvent);
     XIDeviceEvent* xievent = static_cast<XIDeviceEvent*>(xevent->xcookie.data);