| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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/keyboard_codes.h" | 5 #include "base/keyboard_codes.h" |
| 6 #include "base/message_loop.h" | 6 #include "base/message_loop.h" |
| 7 #include "chrome/browser/browser.h" | 7 #include "chrome/browser/browser.h" |
| 8 #include "chrome/browser/browser_window.h" | 8 #include "chrome/browser/browser_window.h" |
| 9 #include "chrome/browser/find_bar_controller.h" | 9 #include "chrome/browser/find_bar_controller.h" |
| 10 #include "chrome/browser/find_notification_details.h" | 10 #include "chrome/browser/find_notification_details.h" |
| (...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 464 ASSERT_TRUE(NULL != tab_contents); | 464 ASSERT_TRUE(NULL != tab_contents); |
| 465 | 465 |
| 466 // Search for a text that exists within a link on the page. | 466 // Search for a text that exists within a link on the page. |
| 467 int ordinal = 0; | 467 int ordinal = 0; |
| 468 EXPECT_EQ(2, FindInPageWchar(tab_contents, L"html ", | 468 EXPECT_EQ(2, FindInPageWchar(tab_contents, L"html ", |
| 469 kFwd, kIgnoreCase, &ordinal)); | 469 kFwd, kIgnoreCase, &ordinal)); |
| 470 EXPECT_EQ(1, ordinal); | 470 EXPECT_EQ(1, ordinal); |
| 471 } | 471 } |
| 472 | 472 |
| 473 // Make sure Find box disappears on Navigate but not on Refresh. | 473 // Make sure Find box disappears on Navigate but not on Refresh. |
| 474 #if defined(OS_LINUX) |
| 475 // The last EXPECT_FALSE(fully_visible) is flaky (especially on |
| 476 // 64bit build.). See bug http://crbug.com/28629. |
| 477 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, |
| 478 FLAKY_FindDisappearOnNavigate) { |
| 479 #else |
| 474 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindDisappearOnNavigate) { | 480 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindDisappearOnNavigate) { |
| 481 #endif |
| 475 HTTPTestServer* server = StartHTTPServer(); | 482 HTTPTestServer* server = StartHTTPServer(); |
| 476 | 483 |
| 477 // First we navigate to our special focus tracking page. | 484 // First we navigate to our special focus tracking page. |
| 478 GURL url = server->TestServerPageW(kSimplePage); | 485 GURL url = server->TestServerPageW(kSimplePage); |
| 479 GURL url2 = server->TestServerPageW(kFramePage); | 486 GURL url2 = server->TestServerPageW(kFramePage); |
| 480 ui_test_utils::NavigateToURL(browser(), url); | 487 ui_test_utils::NavigateToURL(browser(), url); |
| 481 | 488 |
| 482 // Open the Find window with animations disabled. | 489 // Open the Find window with animations disabled. |
| 483 DropdownBarHost::disable_animations_during_testing_ = true; | 490 DropdownBarHost::disable_animations_during_testing_ = true; |
| 484 browser()->ShowFindBar(); | 491 browser()->ShowFindBar(); |
| (...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 753 kFwd, kIgnoreCase, &ordinal)); | 760 kFwd, kIgnoreCase, &ordinal)); |
| 754 EXPECT_EQ(1, ordinal); | 761 EXPECT_EQ(1, ordinal); |
| 755 | 762 |
| 756 // End the Find session, thereby making the next F3 start afresh. | 763 // End the Find session, thereby making the next F3 start afresh. |
| 757 browser()->GetFindBarController()->EndFindSession(); | 764 browser()->GetFindBarController()->EndFindSession(); |
| 758 | 765 |
| 759 // Simulate F3 while Find box is closed. Should have 1 match. | 766 // Simulate F3 while Find box is closed. Should have 1 match. |
| 760 EXPECT_EQ(1, FindInPageWchar(tab, L"", kFwd, kIgnoreCase, &ordinal)); | 767 EXPECT_EQ(1, FindInPageWchar(tab, L"", kFwd, kIgnoreCase, &ordinal)); |
| 761 EXPECT_EQ(1, ordinal); | 768 EXPECT_EQ(1, ordinal); |
| 762 } | 769 } |
| OLD | NEW |