Index: chrome/browser/ui/views/find_bar_host_interactive_uitest.cc |
=================================================================== |
--- chrome/browser/ui/views/find_bar_host_interactive_uitest.cc (revision 71220) |
+++ chrome/browser/ui/views/find_bar_host_interactive_uitest.cc (working copy) |
@@ -2,7 +2,6 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "app/keyboard_codes.h" |
#include "base/process_util.h" |
#include "base/string_util.h" |
#include "base/utf_string_conversions.h" |
@@ -16,6 +15,7 @@ |
#include "chrome/test/in_process_browser_test.h" |
#include "chrome/test/ui_test_utils.h" |
#include "net/test/test_server.h" |
+#include "ui/base/keycodes/keyboard_codes.h" |
#include "views/focus/focus_manager.h" |
#include "views/view.h" |
@@ -73,7 +73,7 @@ |
// This used to crash until bug 1303709 was fixed. |
ASSERT_TRUE(ui_test_utils::SendKeyPressSync( |
- browser(), app::VKEY_ESCAPE, false, false, false, false)); |
+ browser(), ui::VKEY_ESCAPE, false, false, false, false)); |
} |
IN_PROC_BROWSER_TEST_F(FindInPageTest, FocusRestore) { |
@@ -192,21 +192,21 @@ |
// Search for "a". |
ASSERT_TRUE(ui_test_utils::SendKeyPressSync( |
- browser(), app::VKEY_A, false, false, false, false)); |
+ browser(), ui::VKEY_A, false, false, false, false)); |
// We should find "a" here. |
EXPECT_EQ(ASCIIToUTF16("a"), GetFindBarText()); |
// Delete "a". |
ASSERT_TRUE(ui_test_utils::SendKeyPressSync( |
- browser(), app::VKEY_BACK, false, false, false, false)); |
+ browser(), ui::VKEY_BACK, false, false, false, false)); |
// Validate we have cleared the text. |
EXPECT_EQ(string16(), GetFindBarText()); |
// Close the Find box. |
ASSERT_TRUE(ui_test_utils::SendKeyPressSync( |
- browser(), app::VKEY_ESCAPE, false, false, false, false)); |
+ browser(), ui::VKEY_ESCAPE, false, false, false, false)); |
// Show the Find bar. |
browser()->GetFindBarController()->Show(); |
@@ -217,11 +217,11 @@ |
// Close the Find box. |
ASSERT_TRUE(ui_test_utils::SendKeyPressSync( |
- browser(), app::VKEY_ESCAPE, false, false, false, false)); |
+ browser(), ui::VKEY_ESCAPE, false, false, false, false)); |
// Press F3 to trigger FindNext. |
ASSERT_TRUE(ui_test_utils::SendKeyPressSync( |
- browser(), app::VKEY_F3, false, false, false, false)); |
+ browser(), ui::VKEY_F3, false, false, false, false)); |
// After the Find box has been reopened, it should still have no prepopulate |
// value. |