| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "app/keyboard_codes.h" | 5 #include "app/keyboard_codes.h" |
| 6 #include "base/string_util.h" | 6 #include "base/string_util.h" |
| 7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
| 8 #include "chrome/browser/browser.h" | 8 #include "chrome/browser/browser.h" |
| 9 #include "chrome/browser/find_bar_controller.h" | 9 #include "chrome/browser/find_bar_controller.h" |
| 10 #include "chrome/browser/tab_contents/tab_contents.h" | 10 #include "chrome/browser/tab_contents/tab_contents.h" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 IN_PROC_BROWSER_TEST_F(FindInPageTest, CrashEscHandlers) { | 43 IN_PROC_BROWSER_TEST_F(FindInPageTest, CrashEscHandlers) { |
| 44 ASSERT_TRUE(test_server()->Start()); | 44 ASSERT_TRUE(test_server()->Start()); |
| 45 | 45 |
| 46 // First we navigate to our test page (tab A). | 46 // First we navigate to our test page (tab A). |
| 47 GURL url = test_server()->GetURL(kSimplePage); | 47 GURL url = test_server()->GetURL(kSimplePage); |
| 48 ui_test_utils::NavigateToURL(browser(), url); | 48 ui_test_utils::NavigateToURL(browser(), url); |
| 49 | 49 |
| 50 browser()->Find(); | 50 browser()->Find(); |
| 51 | 51 |
| 52 // Open another tab (tab B). | 52 // Open another tab (tab B). |
| 53 Browser::AddTabWithURLParams params(url, PageTransition::TYPED); | 53 browser()->AddSelectedTabWithURL(url, PageTransition::TYPED); |
| 54 browser()->AddTabWithURL(¶ms); | |
| 55 EXPECT_EQ(browser(), params.target); | |
| 56 | 54 |
| 57 browser()->Find(); | 55 browser()->Find(); |
| 58 EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), | 56 EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), |
| 59 VIEW_ID_FIND_IN_PAGE_TEXT_FIELD)); | 57 VIEW_ID_FIND_IN_PAGE_TEXT_FIELD)); |
| 60 | 58 |
| 61 // Select tab A. | 59 // Select tab A. |
| 62 browser()->SelectTabContentsAt(0, true); | 60 browser()->SelectTabContentsAt(0, true); |
| 63 | 61 |
| 64 // Close tab B. | 62 // Close tab B. |
| 65 browser()->CloseTabContents(browser()->GetTabContentsAt(1)); | 63 browser()->CloseTabContents(browser()->GetTabContentsAt(1)); |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 169 browser(), app::VKEY_ESCAPE, false, false, false, false)); | 167 browser(), app::VKEY_ESCAPE, false, false, false, false)); |
| 170 | 168 |
| 171 // Press F3 to trigger FindNext. | 169 // Press F3 to trigger FindNext. |
| 172 ASSERT_TRUE(ui_test_utils::SendKeyPressSync( | 170 ASSERT_TRUE(ui_test_utils::SendKeyPressSync( |
| 173 browser(), app::VKEY_F3, false, false, false, false)); | 171 browser(), app::VKEY_F3, false, false, false, false)); |
| 174 | 172 |
| 175 // After the Find box has been reopened, it should still have no prepopulate | 173 // After the Find box has been reopened, it should still have no prepopulate |
| 176 // value. | 174 // value. |
| 177 EXPECT_EQ(string16(), GetFindBarText()); | 175 EXPECT_EQ(string16(), GetFindBarText()); |
| 178 } | 176 } |
| OLD | NEW |