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

chrome/browser/instant/instant_browsertest.cc

 // 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.
 
 #include "base/command_line.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
@@ skipping 93 matching lines @@
         GetSearchStateAsString(preview_));
   }
 
   void SetLocationBarText(const std::wstring& text) {
     ASSERT_NO_FATAL_FAILURE(FindLocationBar());
     location_bar_->location_entry()->SetUserText(text);
     ui_test_utils::WaitForNotification(
         NotificationType::INSTANT_CONTROLLER_SHOWN);
   }
 
-  void SendKey(app::KeyboardCode key) {
+  void SendKey(ui::KeyboardCode key) {
     ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
         browser(), key, false, false, false, false));
   }
 
   bool GetStringFromJavascript(TabContents* tab_contents,
                                const std::string& function,
                                std::string* result) {
     std::string script = StringPrintf(
         "window.domAutomationController.send(%s)", function.c_str());
     return ui_test_utils::ExecuteJavaScriptAndExtractString(
@@ skipping 348 matching lines @@
 // Verify that the onsubmit event is dispatched upon pressing enter.
 IN_PROC_BROWSER_TEST_F(InstantTest, OnSubmitEvent) {
   ASSERT_TRUE(test_server()->Start());
   ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("search.html"));
 
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
   ASSERT_NO_FATAL_FAILURE(SetupLocationBar());
   ASSERT_NO_FATAL_FAILURE(SetupPreview());
 
   ASSERT_NO_FATAL_FAILURE(SetLocationBarText(L"abc"));
-  ASSERT_NO_FATAL_FAILURE(SendKey(app::VKEY_RETURN));
+  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_RETURN));
 
   // Check that the preview contents have been committed.
   ASSERT_FALSE(browser()->instant()->GetPreviewContents());
   ASSERT_FALSE(browser()->instant()->is_active());
   TabContents* contents = browser()->GetSelectedTabContents();
   ASSERT_TRUE(contents);
 
   // Check that the value is reflected and onsubmit is called.
   EXPECT_EQ("true 1 0 1 1 a false abc true",
       GetSearchStateAsString(preview_));
@@ skipping 33 matching lines @@
   ASSERT_TRUE(test_server()->Start());
   ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("search.html"));
 
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
   ASSERT_NO_FATAL_FAILURE(SetupLocationBar());
   ASSERT_NO_FATAL_FAILURE(SetupPreview());
 
   ASSERT_NO_FATAL_FAILURE(SetLocationBarText(L"abc"));
 
   // Pressing tab to convert instant suggest into inline autocomplete.
-  ASSERT_NO_FATAL_FAILURE(SendKey(app::VKEY_TAB));
+  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB));
 
   ASSERT_EQ(L"abcdef", location_bar_->location_entry()->GetText());
 
   EXPECT_EQ("true 0 0 2 2 a false abcdef false",
       GetSearchStateAsString(preview_));
 
   // Pressing tab again to accept the current instant preview.
-  ASSERT_NO_FATAL_FAILURE(SendKey(app::VKEY_TAB));
+  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB));
 
   // Check that the preview contents have been committed.
   ASSERT_FALSE(browser()->instant()->GetPreviewContents());
   ASSERT_FALSE(browser()->instant()->is_active());
   TabContents* contents = browser()->GetSelectedTabContents();
   ASSERT_TRUE(contents);
 
   // Check that the value is reflected and onsubmit is called.
   EXPECT_EQ("true 1 0 2 2 a false abcdef true",
       GetSearchStateAsString(preview_));
 }