Move app/key* to ui/base/keycodes/*

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 <queue>
 #include <string>
 #include <set>
 
-#include "app/keyboard_codes.h"
 #include "base/basictypes.h"
 #include "base/message_loop.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string16.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/test/automation/dom_element_proxy.h"
 #include "gfx/native_widget_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/keycodes/keyboard_codes.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class AppModalDialog;
 class BookmarkModel;
 class BookmarkNode;
 class Browser;
 class CommandLine;
 class DownloadManager;
 class ExtensionAction;
 class FilePath;
@@ skipping 213 matching lines @@
 // success.
 bool BringBrowserWindowToFront(const Browser* browser) WARN_UNUSED_RESULT;
 
 // Gets the first browser that is not in the specified set.
 Browser* GetBrowserNotInSet(std::set<Browser*> excluded_browsers);
 
 // 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(const Browser* browser,
-                      app::KeyboardCode key,
+                      ui::KeyboardCode key,
                       bool control,
                       bool shift,
                       bool alt,
                       bool command) WARN_UNUSED_RESULT;
 
 // Sends a key press, blocking until both the key press and a notification from
 // |source| of type |type| are received, or until the test times out. This uses
 // ui_controls::SendKeyPress, see it for details. Returns true if the event was
 // successfully sent and both the event and notification were received.
 bool SendKeyPressAndWait(const Browser* browser,
-                         app::KeyboardCode key,
+                         ui::KeyboardCode key,
                          bool control,
                          bool shift,
                          bool alt,
                          bool command,
                          NotificationType type,
                          const NotificationSource& source) WARN_UNUSED_RESULT;
 
 // Run a message loop only for the specified amount of time.
 class TimedMessageLoopRunner {
  public:
@@ skipping 185 matching lines @@
   std::map<uintptr_t, U> details_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowedNotificationObserverWithDetails);
 };
 
 // See SendKeyPressAndWait.  This function additionally performs a check on the
 // NotificationDetails using the provided Details<U>.
 template <class U>
 bool SendKeyPressAndWaitWithDetails(
     const Browser* browser,
-    app::KeyboardCode key,
+    ui::KeyboardCode key,
     bool control,
     bool shift,
     bool alt,
     bool command,
     NotificationType type,
     const NotificationSource& source,
     const Details<U>& details) WARN_UNUSED_RESULT;
 
 template <class U>
 bool SendKeyPressAndWaitWithDetails(
     const Browser* browser,
-    app::KeyboardCode key,
+    ui::KeyboardCode key,
     bool control,
     bool shift,
     bool alt,
     bool command,
     NotificationType type,
     const NotificationSource& source,
     const Details<U>& details) {
   WindowedNotificationObserverWithDetails<U> observer(type, source);
 
   if (!SendKeyPressSync(browser, key, control, shift, alt, command))
@@ skipping 48 matching lines @@
 
 // Takes a snapshot of the entire page, according to the width and height
 // properties of the DOM's document. Returns true on success. DOMAutomation
 // must be enabled.
 bool TakeEntirePageSnapshot(RenderViewHost* rvh,
                             SkBitmap* bitmap) WARN_UNUSED_RESULT;
 
 }  // namespace ui_test_utils
 
 #endif  // CHROME_TEST_UI_TEST_UTILS_H_