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

chrome/test/ui_test_utils.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_UI_TEST_UTILS_H_
 #define CHROME_TEST_UI_TEST_UTILS_H_
 #pragma once
 
 #include <map>
 #include <string>
 #include <set>
 
-#include "app/keyboard_codes.h"
 #include "base/basictypes.h"
+#include "base/keyboard_codes.h"
 #include "base/message_loop.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string16.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/test/automation/dom_element_proxy.h"
 #include "gfx/native_widget_types.h"
@@ skipping 161 matching lines @@
                      NotificationType::Type type,
                      const NotificationSource& source);
 
 // Blocks until |model| finishes loading.
 void WaitForBookmarkModelToLoad(BookmarkModel* model);
 
 // Sends a key press blocking until the key press is received or the test times
 // out. This uses ui_controls::SendKeyPress, see it for details. Returns true
 // if the event was successfully sent and received.
 bool SendKeyPressSync(gfx::NativeWindow window,
-                      app::KeyboardCode key,
+                      base::KeyboardCode key,
                       bool control,
                       bool shift,
                       bool alt,
                       bool command) WARN_UNUSED_RESULT;
 
 // Run a message loop only for the specified amount of time.
 class TimedMessageLoopRunner {
  public:
   // Create new MessageLoopForUI and attach to it.
   TimedMessageLoopRunner();
@@ skipping 224 matching lines @@
 
 // Hide a native window.
 void HideNativeWindow(gfx::NativeWindow window);
 
 // Show and focus a native window.
 void ShowAndFocusNativeWindow(gfx::NativeWindow window);
 
 }  // namespace ui_test_utils
 
 #endif  // CHROME_TEST_UI_TEST_UTILS_H_