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

chrome/test/automation/window_proxy.h

 // 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.
 
 #ifndef CHROME_TEST_AUTOMATION_WINDOW_PROXY_H__
 #define CHROME_TEST_AUTOMATION_WINDOW_PROXY_H__
 #pragma once
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
-#include "app/keyboard_codes.h"
+#include "base/keyboard_codes.h"
 #include "base/string16.h"
 #include "base/thread.h"
 #include "chrome/test/automation/automation_handle_tracker.h"
 
 class BrowserProxy;
 class WindowProxy;
 
 namespace gfx {
   class Point;
   class Rect;
@@ skipping 21 matching lines @@
   // in the window's coordinates.
   bool SimulateOSMouseMove(const gfx::Point& location);
 
   // 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(app::KeyboardCode key, int flags);
+  bool SimulateOSKeyPress(base::KeyboardCode key, int flags);
 
   // Shows/hides the window and as a result makes it active/inactive.
   // Returns true if the call was successful.
   bool SetVisible(bool visible);
 
   // Sets |active| to true if this view is currently the active window.
   // Returns true if the call was successful.
   bool IsActive(bool* active);
 
   // Make this window the active window.
@@ skipping 33 matching lines @@
   // before the specified timeout.
   scoped_refptr<BrowserProxy> GetBrowserWithTimeout(uint32 timeout_ms,
       bool* is_timeout);
  protected:
   virtual ~WindowProxy() {}
  private:
   DISALLOW_COPY_AND_ASSIGN(WindowProxy);
 };
 
 #endif  // CHROME_TEST_AUTOMATION_WINDOW_PROXY_H__