Re-lands 58186:

chrome/test/render_view_test.cc

Index: chrome/test/render_view_test.cc
diff --git a/chrome/test/render_view_test.cc b/chrome/test/render_view_test.cc
index 9094525c57e85d135d1022717eab4aa91e48dd53..848f44002dcbb50c3f12d329abc2e452f1e07a52 100644
--- a/chrome/test/render_view_test.cc
+++ b/chrome/test/render_view_test.cc
@@ -26,7 +26,7 @@
 #include "webkit/glue/webkit_glue.h"
 
 #if defined(OS_LINUX)
-#include "base/event_synthesis_gtk.h"
+#include "app/event_synthesis_gtk.h"
 #endif
 
 using WebKit::WebFrame;
@@ -188,8 +188,8 @@ int RenderViewTest::SendKeyEvent(MockKeyboard::Layout layout,
   // We ignore |layout|, which means we are only testing the layout of the
   // current locale. TODO(estade): fix this to respect |layout|.
   std::vector<GdkEvent*> events;
-  base::SynthesizeKeyPressEvents(
-      NULL, static_cast<base::KeyboardCode>(key_code),
+  app::SynthesizeKeyPressEvents(
+      NULL, static_cast<app::KeyboardCode>(key_code),
       modifiers & (MockKeyboard::LEFT_CONTROL | MockKeyboard::RIGHT_CONTROL),
       modifiers & (MockKeyboard::LEFT_SHIFT | MockKeyboard::RIGHT_SHIFT),
       modifiers & (MockKeyboard::LEFT_ALT | MockKeyboard::RIGHT_ALT),