| 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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), | 115 EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), |
| 116 VIEW_ID_FIND_IN_PAGE_TEXT_FIELD)); | 116 VIEW_ID_FIND_IN_PAGE_TEXT_FIELD)); |
| 117 browser()->GetFindBarController()->EndFindSession( | 117 browser()->GetFindBarController()->EndFindSession( |
| 118 FindBarController::kKeepSelection); | 118 FindBarController::kKeepSelection); |
| 119 EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_LOCATION_BAR)); | 119 EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_LOCATION_BAR)); |
| 120 } | 120 } |
| 121 | 121 |
| 122 // This tests that whenever you clear values from the Find box and close it that | 122 // This tests that whenever you clear values from the Find box and close it that |
| 123 // it respects that and doesn't show you the last search, as reported in bug: | 123 // it respects that and doesn't show you the last search, as reported in bug: |
| 124 // http://crbug.com/40121. | 124 // http://crbug.com/40121. |
| 125 IN_PROC_BROWSER_TEST_F(FindInPageTest, PrepopulateRespectBlank) { | 125 // Disabled, http://crbug.com/62937. |
| 126 IN_PROC_BROWSER_TEST_F(FindInPageTest, DISABLED_PrepopulateRespectBlank) { |
| 126 #if defined(OS_MACOSX) | 127 #if defined(OS_MACOSX) |
| 127 // FindInPage on Mac doesn't use prepopulated values. Search there is global. | 128 // FindInPage on Mac doesn't use prepopulated values. Search there is global. |
| 128 return; | 129 return; |
| 129 #endif | 130 #endif |
| 130 | 131 |
| 131 ASSERT_TRUE(test_server()->Start()); | 132 ASSERT_TRUE(test_server()->Start()); |
| 132 | 133 |
| 133 // First we navigate to any page. | 134 // First we navigate to any page. |
| 134 GURL url = test_server()->GetURL(kSimplePage); | 135 GURL url = test_server()->GetURL(kSimplePage); |
| 135 ui_test_utils::NavigateToURL(browser(), url); | 136 ui_test_utils::NavigateToURL(browser(), url); |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 browser(), app::VKEY_ESCAPE, false, false, false, false)); | 168 browser(), app::VKEY_ESCAPE, false, false, false, false)); |
| 168 | 169 |
| 169 // Press F3 to trigger FindNext. | 170 // Press F3 to trigger FindNext. |
| 170 ASSERT_TRUE(ui_test_utils::SendKeyPressSync( | 171 ASSERT_TRUE(ui_test_utils::SendKeyPressSync( |
| 171 browser(), app::VKEY_F3, false, false, false, false)); | 172 browser(), app::VKEY_F3, false, false, false, false)); |
| 172 | 173 |
| 173 // After the Find box has been reopened, it should still have no prepopulate | 174 // After the Find box has been reopened, it should still have no prepopulate |
| 174 // value. | 175 // value. |
| 175 EXPECT_EQ(string16(), GetFindBarText()); | 176 EXPECT_EQ(string16(), GetFindBarText()); |
| 176 } | 177 } |
| OLD | NEW |