| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
| 9 #include "chrome/browser/ui/browser_commands.h" | 9 #include "chrome/browser/ui/browser_commands.h" |
| 10 #include "chrome/browser/ui/browser_tabstrip.h" | 10 #include "chrome/browser/ui/browser_tabstrip.h" |
| (...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 212 EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), | 212 EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), |
| 213 VIEW_ID_FIND_IN_PAGE_TEXT_FIELD)); | 213 VIEW_ID_FIND_IN_PAGE_TEXT_FIELD)); |
| 214 EXPECT_TRUE(ASCIIToUTF16("a") == find_bar->GetFindSelectedText()); | 214 EXPECT_TRUE(ASCIIToUTF16("a") == find_bar->GetFindSelectedText()); |
| 215 | 215 |
| 216 // Select tab B. Location bar should get focus. | 216 // Select tab B. Location bar should get focus. |
| 217 chrome::ActivateTabAt(browser(), 1, true); | 217 chrome::ActivateTabAt(browser(), 1, true); |
| 218 EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), | 218 EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), |
| 219 location_bar_focus_view_id_)); | 219 location_bar_focus_view_id_)); |
| 220 } | 220 } |
| 221 | 221 |
| 222 // Flaky on XP: http://crbug.com/152100 |
| 223 #if defined(OS_WIN) |
| 224 #define MAYBE_PrepopulateRespectBlank DISABLED_PrepopulateRespectBlank |
| 225 #else |
| 226 #define MAYBE_PrepopulateRespectBlank PrepopulateRespectBlank |
| 227 #endif |
| 222 // This tests that whenever you clear values from the Find box and close it that | 228 // This tests that whenever you clear values from the Find box and close it that |
| 223 // it respects that and doesn't show you the last search, as reported in bug: | 229 // it respects that and doesn't show you the last search, as reported in bug: |
| 224 // http://crbug.com/40121. | 230 // http://crbug.com/40121. |
| 225 IN_PROC_BROWSER_TEST_F(FindInPageTest, PrepopulateRespectBlank) { | 231 IN_PROC_BROWSER_TEST_F(FindInPageTest, MAYBE_PrepopulateRespectBlank) { |
| 226 #if defined(OS_MACOSX) | 232 #if defined(OS_MACOSX) |
| 227 // FindInPage on Mac doesn't use prepopulated values. Search there is global. | 233 // FindInPage on Mac doesn't use prepopulated values. Search there is global. |
| 228 return; | 234 return; |
| 229 #endif | 235 #endif |
| 230 base::TimeTicks start_time = base::TimeTicks::Now(); | 236 base::TimeTicks start_time = base::TimeTicks::Now(); |
| 231 Checkpoint("Test starting", start_time); | 237 Checkpoint("Test starting", start_time); |
| 232 | 238 |
| 233 ASSERT_TRUE(test_server()->Start()); | 239 ASSERT_TRUE(test_server()->Start()); |
| 234 | 240 |
| 235 // Make sure Chrome is in the foreground, otherwise sending input | 241 // Make sure Chrome is in the foreground, otherwise sending input |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 367 chrome::NOTIFICATION_FIND_RESULT_AVAILABLE, notification_source); | 373 chrome::NOTIFICATION_FIND_RESULT_AVAILABLE, notification_source); |
| 368 | 374 |
| 369 ASSERT_TRUE(ui_test_utils::SendKeyPressSync( | 375 ASSERT_TRUE(ui_test_utils::SendKeyPressSync( |
| 370 browser(), ui::VKEY_V, true, false, false, false)); | 376 browser(), ui::VKEY_V, true, false, false, false)); |
| 371 | 377 |
| 372 ASSERT_NO_FATAL_FAILURE(observer.Wait()); | 378 ASSERT_NO_FATAL_FAILURE(observer.Wait()); |
| 373 FindNotificationDetails details; | 379 FindNotificationDetails details; |
| 374 ASSERT_TRUE(observer.GetDetailsFor(notification_source.map_key(), &details)); | 380 ASSERT_TRUE(observer.GetDetailsFor(notification_source.map_key(), &details)); |
| 375 EXPECT_TRUE(details.number_of_matches() > 0); | 381 EXPECT_TRUE(details.number_of_matches() > 0); |
| 376 } | 382 } |
| OLD | NEW |