| 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/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/tabs/tab_strip_model.h" | 8 #include "chrome/browser/tabs/tab_strip_model.h" |
| 9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/browser/ui/find_bar/find_bar_controller.h" | 10 #include "chrome/browser/ui/find_bar/find_bar_controller.h" |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 } | 64 } |
| 65 | 65 |
| 66 ViewID location_bar_focus_view_id_; | 66 ViewID location_bar_focus_view_id_; |
| 67 | 67 |
| 68 private: | 68 private: |
| 69 DISALLOW_COPY_AND_ASSIGN(FindInPageTest); | 69 DISALLOW_COPY_AND_ASSIGN(FindInPageTest); |
| 70 }; | 70 }; |
| 71 | 71 |
| 72 } // namespace | 72 } // namespace |
| 73 | 73 |
| 74 #if defined(TOOLKIT_USES_GTK) | 74 // Flaky, see crbug.com/109906. |
| 75 #if defined(TOOLKIT_USES_GTK) || defined(USE_AURA) |
| 75 #define MAYBE_CrashEscHandlers FLAKY_CrashEscHandlers | 76 #define MAYBE_CrashEscHandlers FLAKY_CrashEscHandlers |
| 76 #else | 77 #else |
| 77 #define MAYBE_CrashEscHandlers CrashEscHandlers | 78 #define MAYBE_CrashEscHandlers CrashEscHandlers |
| 78 #endif | 79 #endif |
| 79 | 80 |
| 80 IN_PROC_BROWSER_TEST_F(FindInPageTest, MAYBE_CrashEscHandlers) { | 81 IN_PROC_BROWSER_TEST_F(FindInPageTest, MAYBE_CrashEscHandlers) { |
| 81 ASSERT_TRUE(test_server()->Start()); | 82 ASSERT_TRUE(test_server()->Start()); |
| 82 | 83 |
| 83 // First we navigate to our test page (tab A). | 84 // First we navigate to our test page (tab A). |
| 84 GURL url = test_server()->GetURL(kSimplePage); | 85 GURL url = test_server()->GetURL(kSimplePage); |
| (...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 359 chrome::NOTIFICATION_FIND_RESULT_AVAILABLE, notification_source); | 360 chrome::NOTIFICATION_FIND_RESULT_AVAILABLE, notification_source); |
| 360 | 361 |
| 361 ASSERT_TRUE(ui_test_utils::SendKeyPressSync( | 362 ASSERT_TRUE(ui_test_utils::SendKeyPressSync( |
| 362 browser(), ui::VKEY_V, true, false, false, false)); | 363 browser(), ui::VKEY_V, true, false, false, false)); |
| 363 | 364 |
| 364 ASSERT_NO_FATAL_FAILURE(observer.Wait()); | 365 ASSERT_NO_FATAL_FAILURE(observer.Wait()); |
| 365 FindNotificationDetails details; | 366 FindNotificationDetails details; |
| 366 ASSERT_TRUE(observer.GetDetailsFor(notification_source.map_key(), &details)); | 367 ASSERT_TRUE(observer.GetDetailsFor(notification_source.map_key(), &details)); |
| 367 EXPECT_TRUE(details.number_of_matches() > 0); | 368 EXPECT_TRUE(details.number_of_matches() > 0); |
| 368 } | 369 } |
| OLD | NEW |