Re-lands 58186:

chrome/test/automation/window_proxy.cc

 // Copyright (c) 2006-2008 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/automation/window_proxy.h"
 
 #include <vector>
 #include <algorithm>
 
 #include "base/logging.h"
@@ skipping 23 matching lines @@
   if (!is_valid()) return false;
 
   if (!text) {
     NOTREACHED();
     return false;
   }
 
   return sender_->Send(new AutomationMsg_WindowTitle(0, handle_, text));
 }
 
-bool WindowProxy::SimulateOSKeyPress(base::KeyboardCode key, int flags) {
+bool WindowProxy::SimulateOSKeyPress(app::KeyboardCode key, int flags) {
   if (!is_valid()) return false;
 
   return sender_->Send(
       new AutomationMsg_WindowKeyPress(0, handle_, key, flags));
 }
 
 bool WindowProxy::SetVisible(bool visible) {
   if (!is_valid()) return false;
 
   bool result = false;
@@ skipping 110 matching lines @@
 bool WindowProxy::IsMaximized(bool* maximized) {
   if (!is_valid())
     return false;
 
   bool result = false;
 
   sender_->Send(new AutomationMsg_IsWindowMaximized(0, handle_, maximized,
                                                     &result));
   return result;
 }