| 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/file_util.h" | 5 #include "base/file_util.h" |
| 6 #include "base/message_loop/message_loop.h" | 6 #include "base/message_loop/message_loop.h" |
| 7 #include "base/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
| 8 #include "base/strings/string16.h" | 8 #include "base/strings/string16.h" |
| 9 #include "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 783 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 794 // This string appears 5 times at the bottom of a long page. If Find restarts | 794 // This string appears 5 times at the bottom of a long page. If Find restarts |
| 795 // properly after a timeout, it will find 5 matches, not just 1. | 795 // properly after a timeout, it will find 5 matches, not just 1. |
| 796 int ordinal = 0; | 796 int ordinal = 0; |
| 797 EXPECT_EQ(5, FindInPageWchar(browser()->tab_strip_model()-> | 797 EXPECT_EQ(5, FindInPageWchar(browser()->tab_strip_model()-> |
| 798 GetActiveWebContents(), | 798 GetActiveWebContents(), |
| 799 L"008.xml", | 799 L"008.xml", |
| 800 kFwd, kIgnoreCase, &ordinal)); | 800 kFwd, kIgnoreCase, &ordinal)); |
| 801 EXPECT_EQ(1, ordinal); | 801 EXPECT_EQ(1, ordinal); |
| 802 } | 802 } |
| 803 | 803 |
| 804 // Disable the test for win, mac and ChromeOS as it started being flaky, see | |
| 805 // http://crbug/367701. | |
| 806 #if defined(OS_MACOSX) && !defined(OS_IOS) || defined(OS_WIN) || \ | |
| 807 defined(OS_CHROMEOS) | |
| 808 #define MAYBE_FindRestarts_Issue70505 DISABLED_FindRestarts_Issue70505 | |
| 809 #else | |
| 810 #define MAYBE_FindRestarts_Issue70505 FindRestarts_Issue70505 | |
| 811 #endif | |
| 812 // Make sure we don't get into an infinite loop when text box contains very | 804 // Make sure we don't get into an infinite loop when text box contains very |
| 813 // large amount of text. | 805 // large amount of text. |
| 806 // Disable the test as it started being flaky, see http://crbug/367701. |
| 814 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, | 807 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, |
| 815 MAYBE_FindRestarts_Issue70505) { | 808 DISABLED_FindRestarts_Issue70505) { |
| 816 // First we navigate to our page. | 809 // First we navigate to our page. |
| 817 GURL url = GetURL(kLongTextareaPage); | 810 GURL url = GetURL(kLongTextareaPage); |
| 818 ui_test_utils::NavigateToURL(browser(), url); | 811 ui_test_utils::NavigateToURL(browser(), url); |
| 819 | 812 |
| 820 // If this test hangs on the FindInPage call, then it might be a regression | 813 // If this test hangs on the FindInPage call, then it might be a regression |
| 821 // such as the one found in issue http://crbug.com/70505. | 814 // such as the one found in issue http://crbug.com/70505. |
| 822 int ordinal = 0; | 815 int ordinal = 0; |
| 823 FindInPageWchar(browser()->tab_strip_model()->GetActiveWebContents(), | 816 FindInPageWchar(browser()->tab_strip_model()->GetActiveWebContents(), |
| 824 L"a", kFwd, kIgnoreCase, &ordinal); | 817 L"a", kFwd, kIgnoreCase, &ordinal); |
| 825 EXPECT_EQ(1, ordinal); | 818 EXPECT_EQ(1, ordinal); |
| (...skipping 796 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1622 ASSERT_EQ(result, SIMPLEREGION); | 1615 ASSERT_EQ(result, SIMPLEREGION); |
| 1623 bool rects_equal = | 1616 bool rects_equal = |
| 1624 region_before.left == region_after.left && | 1617 region_before.left == region_after.left && |
| 1625 region_before.top == region_after.top && | 1618 region_before.top == region_after.top && |
| 1626 region_before.right == region_after.right && | 1619 region_before.right == region_after.right && |
| 1627 region_before.bottom == region_after.bottom; | 1620 region_before.bottom == region_after.bottom; |
| 1628 ASSERT_FALSE(rects_equal); | 1621 ASSERT_FALSE(rects_equal); |
| 1629 } | 1622 } |
| 1630 | 1623 |
| 1631 #endif | 1624 #endif |
| OLD | NEW |