event-rewrite: Clean up how events are rewritten.

chrome/browser/chromeos/keyboard_driven_event_rewriter_unittest.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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chromeos/keyboard_driven_event_rewriter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event.h"
@@ skipping 24 matching lines @@
   std::string GetRewrittenEventAsString(ui::KeyboardCode ui_keycode,
                                         int ui_flags,
                                         ui::EventType ui_type,
                                         KeyCode x_keycode,
                                         unsigned int x_state) {
     ui::ScopedXI2Event xev;
     xev.InitKeyEvent(ui_type, ui_keycode, ui_flags);
     XEvent* xevent = xev;
     xevent->xkey.keycode = x_keycode;
     xevent->xkey.state = x_state;
+    bool changed = rewriter_.RewriteForTesting(xevent);
     ui::KeyEvent keyevent(xev, false /* is_char */);
-    bool changed = rewriter_.RewriteForTesting(&keyevent);
     return base::StringPrintf("ui_flags=%d x_state=%u changed=%d",
                               keyevent.flags(),
                               xevent->xkey.state,
                               changed);
   }
 
   std::string GetExpectedResultAsString(int ui_flags,
                                         unsigned int x_state,
                                         bool changed) {
     return base::StringPrintf(
@@ skipping 93 matching lines @@
               GetRewrittenEventAsString(kTests[i].ui_keycode,
                                         kTests[i].ui_flags,
                                         ui::ET_KEY_PRESSED,
                                         kTests[i].x_keycode,
                                         kTests[i].x_state))
     << "Test case " << i;
   }
 }
 
 }  // namespace chromeos