| 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 "base/process_util.h" | 5 #include "base/process_util.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/tab_contents/tab_contents.h" | 8 #include "chrome/browser/tab_contents/tab_contents.h" |
| 9 #include "chrome/browser/tabs/tab_strip_model.h" | 9 #include "chrome/browser/tabs/tab_strip_model.h" |
| 10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 164 EXPECT_TRUE(ASCIIToUTF16("a") == find_bar->GetFindSelectedText()); | 164 EXPECT_TRUE(ASCIIToUTF16("a") == find_bar->GetFindSelectedText()); |
| 165 | 165 |
| 166 // Select tab B. Location bar should get focus. | 166 // Select tab B. Location bar should get focus. |
| 167 browser()->SelectTabContentsAt(1, true); | 167 browser()->SelectTabContentsAt(1, true); |
| 168 EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_LOCATION_BAR)); | 168 EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_LOCATION_BAR)); |
| 169 } | 169 } |
| 170 | 170 |
| 171 // This tests that whenever you clear values from the Find box and close it that | 171 // This tests that whenever you clear values from the Find box and close it that |
| 172 // it respects that and doesn't show you the last search, as reported in bug: | 172 // it respects that and doesn't show you the last search, as reported in bug: |
| 173 // http://crbug.com/40121. | 173 // http://crbug.com/40121. |
| 174 IN_PROC_BROWSER_TEST_F(FindInPageTest, PrepopulateRespectBlank) { | 174 // Crashy, http://crbug.com/69882. |
| 175 IN_PROC_BROWSER_TEST_F(FindInPageTest, DISABLED_PrepopulateRespectBlank) { |
| 175 #if defined(OS_MACOSX) | 176 #if defined(OS_MACOSX) |
| 176 // FindInPage on Mac doesn't use prepopulated values. Search there is global. | 177 // FindInPage on Mac doesn't use prepopulated values. Search there is global. |
| 177 return; | 178 return; |
| 178 #endif | 179 #endif |
| 179 | 180 |
| 180 ASSERT_TRUE(test_server()->Start()); | 181 ASSERT_TRUE(test_server()->Start()); |
| 181 | 182 |
| 182 // Make sure Chrome is in the foreground, otherwise sending input | 183 // Make sure Chrome is in the foreground, otherwise sending input |
| 183 // won't do anything and the test will hang. | 184 // won't do anything and the test will hang. |
| 184 ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); | 185 ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 220 browser(), ui::VKEY_ESCAPE, false, false, false, false)); | 221 browser(), ui::VKEY_ESCAPE, false, false, false, false)); |
| 221 | 222 |
| 222 // Press F3 to trigger FindNext. | 223 // Press F3 to trigger FindNext. |
| 223 ASSERT_TRUE(ui_test_utils::SendKeyPressSync( | 224 ASSERT_TRUE(ui_test_utils::SendKeyPressSync( |
| 224 browser(), ui::VKEY_F3, false, false, false, false)); | 225 browser(), ui::VKEY_F3, false, false, false, false)); |
| 225 | 226 |
| 226 // After the Find box has been reopened, it should still have no prepopulate | 227 // After the Find box has been reopened, it should still have no prepopulate |
| 227 // value. | 228 // value. |
| 228 EXPECT_EQ(string16(), GetFindBarText()); | 229 EXPECT_EQ(string16(), GetFindBarText()); |
| 229 } | 230 } |
| OLD | NEW |