Revert 58215 - Revert 58186 - Move the keyboard files from base/ to app/....

chrome/browser/automation/ui_controls.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_BROWSER_AUTOMATION_UI_CONTROLS_H_
 #define CHROME_BROWSER_AUTOMATION_UI_CONTROLS_H_
 #pragma once
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <wtypes.h>
 #endif
 
-#include "base/keyboard_codes.h"
+#include "app/keyboard_codes.h"
 #include "gfx/native_widget_types.h"
 #include "gfx/point.h"
 
 #if defined(TOOLKIT_VIEWS)
 namespace views {
 class View;
 }
 #endif
 
 class Task;
@@ skipping 13 matching lines @@
 // might trigger |task| early.
 //
 // Note: Windows does not currently do anything with the |window| argument for
 // these functions, so passing NULL is ok.
 
 // Send a key press with/without modifier keys.
 //
 // If you're writing a test chances are you want the variant in ui_test_utils.
 // See it for details.
 bool SendKeyPress(gfx::NativeWindow window,
-                  base::KeyboardCode key,
+                  app::KeyboardCode key,
                   bool control,
                   bool shift,
                   bool alt,
                   bool command);
 bool SendKeyPressNotifyWhenDone(gfx::NativeWindow window,
-                                base::KeyboardCode key,
+                                app::KeyboardCode key,
                                 bool control,
                                 bool shift,
                                 bool alt,
                                 bool command,
                                 Task* task);
 
 // Simulate a mouse move. (x,y) are absolute screen coordinates.
 bool SendMouseMove(long x, long y);
 bool SendMouseMoveNotifyWhenDone(long x, long y, Task* task);
 
@@ skipping 27 matching lines @@
 #elif defined(OS_MACOSX)
     NSView* view,
 #endif
     MouseButton button,
     int state,
     Task* task);
 
 }  // ui_controls
 
 #endif  // CHROME_BROWSER_AUTOMATION_UI_CONTROLS_H_