| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/message_loop.h" | 5 #include "base/message_loop.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/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.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 686 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 697 | 697 |
| 698 // Make sure Find box has moved back to its original location. | 698 // Make sure Find box has moved back to its original location. |
| 699 EXPECT_EQ(position.x(), start_position.x()); | 699 EXPECT_EQ(position.x(), start_position.x()); |
| 700 } | 700 } |
| 701 | 701 |
| 702 #if defined(OS_MACOSX) | 702 #if defined(OS_MACOSX) |
| 703 // FindNextInNewTabUsesPrepopulate times-out, at least on Mac. | 703 // FindNextInNewTabUsesPrepopulate times-out, at least on Mac. |
| 704 // See http://crbug.com/43070 | 704 // See http://crbug.com/43070 |
| 705 #define MAYBE_FindNextInNewTabUsesPrepopulate \ | 705 #define MAYBE_FindNextInNewTabUsesPrepopulate \ |
| 706 DISABLED_FindNextInNewTabUsesPrepopulate | 706 DISABLED_FindNextInNewTabUsesPrepopulate |
| 707 #elif defined (OS_WIN) | 707 #elif defined(OS_WIN) || defined(USE_AURA) |
| 708 // Occasionally times-out on Windows, too. | 708 // Occasionally times-out on Windows or aura, too. |
| 709 // See http://crbug.com/43070 and http://crbug.com/88316 | 709 // See http://crbug.com/43070 |
| 710 #define MAYBE_FindNextInNewTabUsesPrepopulate \ | 710 #define MAYBE_FindNextInNewTabUsesPrepopulate \ |
| 711 FLAKY_FindNextInNewTabUsesPrepopulate | 711 FLAKY_FindNextInNewTabUsesPrepopulate |
| 712 #else | 712 #else |
| 713 #define MAYBE_FindNextInNewTabUsesPrepopulate FindNextInNewTabUsesPrepopulate | 713 #define MAYBE_FindNextInNewTabUsesPrepopulate FindNextInNewTabUsesPrepopulate |
| 714 #endif | 714 #endif |
| 715 | 715 |
| 716 // Make sure F3 in a new tab works if Find has previous string to search for. | 716 // Make sure F3 in a new tab works if Find has previous string to search for. |
| 717 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, | 717 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, |
| 718 MAYBE_FindNextInNewTabUsesPrepopulate) { | 718 MAYBE_FindNextInNewTabUsesPrepopulate) { |
| 719 ASSERT_TRUE(test_server()->Start()); | 719 ASSERT_TRUE(test_server()->Start()); |
| (...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1135 MessageLoop::current()->RunAllPending(); | 1135 MessageLoop::current()->RunAllPending(); |
| 1136 | 1136 |
| 1137 EnsureFindBoxOpenForBrowser(popup); | 1137 EnsureFindBoxOpenForBrowser(popup); |
| 1138 | 1138 |
| 1139 // GTK adjusts FindBar size asynchronously. | 1139 // GTK adjusts FindBar size asynchronously. |
| 1140 MessageLoop::current()->RunAllPending(); | 1140 MessageLoop::current()->RunAllPending(); |
| 1141 | 1141 |
| 1142 ASSERT_LE(GetFindBarWidthForBrowser(popup), | 1142 ASSERT_LE(GetFindBarWidthForBrowser(popup), |
| 1143 popup->window()->GetBounds().width()); | 1143 popup->window()->GetBounds().width()); |
| 1144 } | 1144 } |
| OLD | NEW |