| Index: content/browser/renderer_host/web_input_event_aura_unittest.cc
|
| ===================================================================
|
| --- content/browser/renderer_host/web_input_event_aura_unittest.cc (revision 150582)
|
| +++ content/browser/renderer_host/web_input_event_aura_unittest.cc (working copy)
|
| @@ -6,7 +6,7 @@
|
|
|
| #include "base/basictypes.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| -#include "ui/aura/event.h"
|
| +#include "ui/base/event.h"
|
|
|
| #if defined(USE_X11)
|
| #include <X11/keysym.h>
|
| @@ -27,7 +27,7 @@
|
| ui::VKEY_CONTROL,
|
| 0, // X does not set ControlMask for KeyPress.
|
| &xev);
|
| - aura::KeyEvent event(&xev, false /* is_char */);
|
| + ui::KeyEvent event(&xev, false /* is_char */);
|
| WebKit::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(&event);
|
| // However, modifier bit for Control in |webkit_event| should be set.
|
| EXPECT_EQ(webkit_event.modifiers, WebKit::WebInputEvent::ControlKey);
|
| @@ -38,7 +38,7 @@
|
| ui::VKEY_CONTROL,
|
| ControlMask, // X sets the mask for KeyRelease.
|
| &xev);
|
| - aura::KeyEvent event(&xev, false /* is_char */);
|
| + ui::KeyEvent event(&xev, false /* is_char */);
|
| WebKit::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(&event);
|
| // However, modifier bit for Control in |webkit_event| shouldn't be set.
|
| EXPECT_EQ(webkit_event.modifiers, 0);
|
| @@ -57,7 +57,7 @@
|
| 0, // X does not set ControlMask for KeyPress.
|
| &xev);
|
| xev.xkey.keycode = XKeysymToKeycode(ui::GetXDisplay(), XK_Control_L);
|
| - aura::KeyEvent event(&xev, false /* is_char */);
|
| + ui::KeyEvent event(&xev, false /* is_char */);
|
| WebKit::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(&event);
|
| // ui::VKEY_LCONTROL, instead of ui::VKEY_CONTROL, should be filled.
|
| EXPECT_EQ(ui::VKEY_LCONTROL, webkit_event.windowsKeyCode);
|
| @@ -69,7 +69,7 @@
|
| 0, // X does not set ControlMask for KeyPress.
|
| &xev);
|
| xev.xkey.keycode = XKeysymToKeycode(ui::GetXDisplay(), XK_Control_R);
|
| - aura::KeyEvent event(&xev, false /* is_char */);
|
| + ui::KeyEvent event(&xev, false /* is_char */);
|
| WebKit::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(&event);
|
| // ui::VKEY_RCONTROL, instead of ui::VKEY_CONTROL, should be filled.
|
| EXPECT_EQ(ui::VKEY_RCONTROL, webkit_event.windowsKeyCode);
|
|
|