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

chrome/test/automated_ui_tests/automated_ui_tests.h

 // 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.
 
 #ifndef CHROME_TEST_AUTOMATED_UI_TESTS_AUTOMATED_UI_TESTS_H_
 #define CHROME_TEST_AUTOMATED_UI_TESTS_AUTOMATED_UI_TESTS_H_
 #pragma once
 
 // This takes an input file of commands, which consist of a series of
 // actions, and runs every command, reporting the status of each one
@@ skipping 85 matching lines @@
 //          soon as the action is performed. If the program finishes, this file
 //          will be overwritten with the normal results. This flag is used to
 //          help debug the tests if they are crashing before they get a chance
 //          to write their results to file.
 //
 // --wait-after-action : waits the specified amount of time (1s by default)
 //                       after each action. Useful for debugging.
 
 #include <string>
 
-#include "app/keyboard_codes.h"
+#include "base/keyboard_codes.h"
 #include "chrome/test/automated_ui_tests/automated_ui_test_base.h"
 #include "chrome/test/ui/ui_test.h"
 
 namespace base {
 class Time;
 }
 
 class AutomatedUITest : public AutomatedUITestBase {
  protected:
   AutomatedUITest();
@@ skipping 171 matching lines @@
 
   // Navigates to about:crash.
   // XML element: <Crash/>
   bool ForceCrash();
 
   // Utility functions --------------------------------------------------------
 
   // Calls SimulateOSKeyPress on the active window. 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).
-  bool SimulateKeyPressInActiveWindow(app::KeyboardCode key, int flags);
+  bool SimulateKeyPressInActiveWindow(base::KeyboardCode key, int flags);
 
   // Opens init file, reads it into the reader, and closes the file.
   // Returns false if there are any errors.
   bool InitXMLReader();
 
   // Closes the xml_writer and outputs the contents of its buffer to
   // the output file.
   bool WriteReportToFile();
 
   // Appends the provided string to the output file.
@@ skipping 81 matching lines @@
   // results.
   bool debug_logging_enabled_;
 
   // A delay in second we wait for after each action.  Useful for debugging.
   int post_action_delay_;
 
   DISALLOW_COPY_AND_ASSIGN(AutomatedUITest);
 };
 
 #endif  // CHROME_TEST_AUTOMATED_UI_TESTS_AUTOMATED_UI_TESTS_H_