Reverting 27412 it breaks the toolkit views Linux build.

TBR=sky
Review URL: http://codereview.chromium.org/254005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27416 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 8 insertions, 9 deletions

diff --git a/chrome/test/automation/automation_messages_internal.h b/chrome/test/automation/automation_messages_internal.h
index 89f90ff..e7016cf 100644
--- a/chrome/test/automation/automation_messages_internal.h
+++ b/chrome/test/automation/automation_messages_internal.h
@@ -415,10 +415,10 @@ IPC_BEGIN_MESSAGES(Automation)
   // This message requests that a key press be performed.
   // Request:
   //   int - the handle of the window that's the context for this click
-  //   int - the base::KeyboardCode of the key that was pressed.
+  //   wchar_t - char of the key that was pressed.
   //   int - the flags which identify the modifiers (shift, ctrl, alt)
   //         associated for, as defined in chrome/views/event.h
-  IPC_MESSAGE_ROUTED3(AutomationMsg_WindowKeyPress, int, int, int)
+  IPC_MESSAGE_ROUTED3(AutomationMsg_WindowKeyPress, int, wchar_t, int)
 
   // This message notifies the AutomationProvider to create a tab which is
   // hosted by an external process.
diff --git a/chrome/test/automation/window_proxy.cc b/chrome/test/automation/window_proxy.cc
index 5b08842..5766259 100644
--- a/chrome/test/automation/window_proxy.cc
+++ b/chrome/test/automation/window_proxy.cc
@@ -34,7 +34,7 @@ bool WindowProxy::GetWindowTitle(string16* text) {
   return sender_->Send(new AutomationMsg_WindowTitle(0, handle_, text));
 }
 
-bool WindowProxy::SimulateOSKeyPress(base::KeyboardCode key, int flags) {
+bool WindowProxy::SimulateOSKeyPress(wchar_t key, int flags) {
   if (!is_valid()) return false;
 
   return sender_->Send(
diff --git a/chrome/test/automation/window_proxy.h b/chrome/test/automation/window_proxy.h
index 33a27c0..539ac20 100644
--- a/chrome/test/automation/window_proxy.h
+++ b/chrome/test/automation/window_proxy.h
@@ -13,7 +13,6 @@
 
 #include <string>
 
-#include "base/keyboard_codes.h"
 #include "base/string16.h"
 #include "base/thread.h"
 #include "chrome/test/automation/automation_handle_tracker.h"
@@ -47,11 +46,11 @@ class WindowProxy : public AutomationResourceProxy {
   // Get the title of the top level window.
   bool GetWindowTitle(string16* text);
 
-  // Simulates a key press at the OS level. |key| is the virtual key code of the
-  // key pressed and |flags| specifies which modifiers keys are also pressed (as
-  // defined in chrome/views/event.h).  Note that this actually sends the event
-  // to the window that has focus.
-  bool SimulateOSKeyPress(base::KeyboardCode key, int flags);
+  // Simulates a key press at the OS level. |key| is the key pressed  and
+  // |flags| specifies which modifiers keys are also pressed (as defined in
+  // chrome/views/event.h).  Note that this actually sends the event to the
+  // window that has focus.
+  bool SimulateOSKeyPress(wchar_t key, int flags);
 
   // Shows/hides the window and as a result makes it active/inactive.
   // Returns true if the call was successful.