Revert 58388 - Revert 58215 - Revert 58186 - Move the keyboard files from bas...

chrome/test/render_view_test.cc

 // Copyright (c) 2010 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/test/render_view_test.h"
 
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/native_web_keyboard_event.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
 #include "chrome/common/renderer_preferences.h"
 #include "chrome/renderer/extensions/event_bindings.h"
 #include "chrome/renderer/extensions/extension_process_bindings.h"
 #include "chrome/renderer/extensions/js_only_v8_extensions.h"
 #include "chrome/renderer/extensions/renderer_extension_bindings.h"
 #include "chrome/renderer/mock_render_process.h"
 #include "chrome/renderer/renderer_main_platform_delegate.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebScriptController.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebScriptSource.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
 #include "webkit/glue/webkit_glue.h"
 
 #if defined(OS_LINUX)
-#include "app/event_synthesis_gtk.h"
+#include "base/event_synthesis_gtk.h"
 #endif
 
 using WebKit::WebFrame;
 using WebKit::WebScriptController;
 using WebKit::WebScriptSource;
 using WebKit::WebString;
 using WebKit::WebURLRequest;
 
 namespace {
 const int32 kRouteId = 5;
@@ skipping 141 matching lines @@
   SendNativeKeyEvent(char_event);
 
   NativeWebKeyboardEvent keyup_event(NULL, WM_KEYUP, key_code, 0);
   SendNativeKeyEvent(keyup_event);
 
   return length;
 #elif defined(OS_LINUX)
   // 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;
-  app::SynthesizeKeyPressEvents(
-      NULL, static_cast<app::KeyboardCode>(key_code),
+  base::SynthesizeKeyPressEvents(
+      NULL, static_cast<base::KeyboardCode>(key_code),
       modifiers & (MockKeyboard::LEFT_CONTROL | MockKeyboard::RIGHT_CONTROL),
       modifiers & (MockKeyboard::LEFT_SHIFT | MockKeyboard::RIGHT_SHIFT),
       modifiers & (MockKeyboard::LEFT_ALT | MockKeyboard::RIGHT_ALT),
       &events);
 
   guint32 unicode_key = 0;
   for (size_t i = 0; i < events.size(); ++i) {
     // Only send the up/down events for key press itself (skip the up/down
     // events for the modifier keys).
     if ((i + 1) == (events.size() / 2) || i == (events.size() / 2)) {
@@ skipping 54 matching lines @@
   ViewHostMsg_DidPrintPage::Param post_did_print_page_param;
   ViewHostMsg_DidPrintPage::Read(did_print_msg, &post_did_print_page_param);
   EXPECT_EQ(0, post_did_print_page_param.a.page_number);
 #elif defined(OS_LINUX)
   const IPC::Message* did_print_msg =
       render_thread_.sink().GetUniqueMessageMatching(
           ViewHostMsg_TempFileForPrintingWritten::ID);
   ASSERT_TRUE(did_print_msg);
 #endif
 }