Re-lands 58186:

chrome/browser/renderer_host/render_widget_host_unittest.cc

Index: chrome/browser/renderer_host/render_widget_host_unittest.cc
diff --git a/chrome/browser/renderer_host/render_widget_host_unittest.cc b/chrome/browser/renderer_host/render_widget_host_unittest.cc
index 1fe03edb89bdd3583c630afa224c4f93778629ff..1c5bb1759ee160c8d7c1ae4619e75be4c7fd262e 100644
--- a/chrome/browser/renderer_host/render_widget_host_unittest.cc
+++ b/chrome/browser/renderer_host/render_widget_host_unittest.cc
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "app/keyboard_codes.h"
 #include "base/basictypes.h"
-#include "base/keyboard_codes.h"
 #include "base/scoped_ptr.h"
 #include "base/shared_memory.h"
 #include "base/timer.h"
@@ -264,7 +264,7 @@ class RenderWidgetHostTest : public testing::Test {
   void SimulateKeyboardEvent(WebInputEvent::Type type) {
     NativeWebKeyboardEvent key_event;
     key_event.type = type;
-    key_event.windowsKeyCode = base::VKEY_L;  // non-null made up value.
+    key_event.windowsKeyCode = app::VKEY_L;  // non-null made up value.
     host_->ForwardKeyboardEvent(key_event);
   }