Convert Aura to use ui::Event.

chrome/browser/ui/ash/event_rewriter_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 "chrome/browser/ui/ash/event_rewriter.h"
 
 #include "base/basictypes.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/aura/event.h"
+#include "ui/base/event.h"
 
 #if defined(OS_CHROMEOS)
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
 
 #include "chrome/browser/chromeos/input_method/mock_xkeyboard.h"
 #include "chrome/browser/chromeos/login/mock_user_manager.h"
 #include "chrome/browser/chromeos/preferences.h"
 #include "ui/base/x/x11_util.h"
 
@@ skipping 14 matching lines @@
 }
 
 std::string GetRewrittenEventAsString(EventRewriter* rewriter,
                                       ui::KeyboardCode ui_keycode,
                                       int ui_flags,
                                       ui::EventType ui_type,
                                       KeyCode x_keycode,
                                       unsigned int x_state) {
   XEvent xev;
   InitXKeyEvent(ui_keycode, ui_flags, ui_type, x_keycode, x_state, &xev);
-  aura::KeyEvent keyevent(&xev, false /* is_char */);
+  ui::KeyEvent keyevent(&xev, false /* is_char */);
   rewriter->RewriteForTesting(&keyevent);
   return StringPrintf(
       "ui_keycode=%d ui_flags=%d ui_type=%d x_keycode=%u x_state=%u x_type=%d",
       keyevent.key_code(), keyevent.flags(), keyevent.type(),
       xev.xkey.keycode, xev.xkey.state, xev.xkey.type);
 }
 
 std::string GetExpectedResultAsString(ui::KeyboardCode ui_keycode,
                                       int ui_flags,
                                       ui::EventType ui_type,
@@ skipping 1561 matching lines @@
   EventRewriter rewriter;
   rewriter.set_pref_service_for_testing(&prefs);
 
   // Send left control press.
   std::string rewritten_event;
   {
     XEvent xev;
     InitXKeyEvent(ui::VKEY_CONTROL, 0, ui::ET_KEY_PRESSED,
                   keycode_control_l_, 0U, &xev);
     xev.xkey.send_event = True;  // XSendEvent() always does this.
-    aura::KeyEvent keyevent(&xev, false /* is_char */);
+    ui::KeyEvent keyevent(&xev, false /* is_char */);
     rewriter.RewriteForTesting(&keyevent);
     rewritten_event = StringPrintf(
         "ui_keycode=%d ui_flags=%d ui_type=%d "
         "x_keycode=%u x_state=%u x_type=%d",
         keyevent.key_code(), keyevent.flags(), keyevent.type(),
         xev.xkey.keycode, xev.xkey.state, xev.xkey.type);
   }
 
   // XK_Control_L (left Control key) should NOT be remapped to Alt if send_event
   // flag in the event is True.
   EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_CONTROL,
                                       0,
                                       ui::ET_KEY_PRESSED,
                                       keycode_control_l_,
                                       0U,
                                       KeyPress),
             rewritten_event);
 }
 #endif  // OS_CHROMEOS