| 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/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 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 284 Checkpoint("Validate", start_time); | 284 Checkpoint("Validate", start_time); |
| 285 | 285 |
| 286 // After the Find box has been reopened, it should still have no prepopulate | 286 // After the Find box has been reopened, it should still have no prepopulate |
| 287 // value. | 287 // value. |
| 288 EXPECT_EQ(string16(), GetFindBarText()); | 288 EXPECT_EQ(string16(), GetFindBarText()); |
| 289 | 289 |
| 290 Checkpoint("Test done", start_time); | 290 Checkpoint("Test done", start_time); |
| 291 } | 291 } |
| 292 | 292 |
| 293 // Flaky on Win. http://crbug.com/92467 | 293 // Flaky on Win. http://crbug.com/92467 |
| 294 #if defined(OS_WIN) | 294 // Flaky on ChromeOS. http://crbug.com/118216 |
| 295 #if defined(OS_WIN) || defined(OS_CHROMEOS) |
| 295 #define MAYBE_PasteWithoutTextChange DISABLED_PasteWithoutTextChange | 296 #define MAYBE_PasteWithoutTextChange DISABLED_PasteWithoutTextChange |
| 296 #else | 297 #else |
| 297 #define MAYBE_PasteWithoutTextChange PasteWithoutTextChange | 298 #define MAYBE_PasteWithoutTextChange PasteWithoutTextChange |
| 298 #endif | 299 #endif |
| 299 | 300 |
| 300 IN_PROC_BROWSER_TEST_F(FindInPageTest, MAYBE_PasteWithoutTextChange) { | 301 IN_PROC_BROWSER_TEST_F(FindInPageTest, MAYBE_PasteWithoutTextChange) { |
| 301 ASSERT_TRUE(test_server()->Start()); | 302 ASSERT_TRUE(test_server()->Start()); |
| 302 | 303 |
| 303 // Make sure Chrome is in the foreground, otherwise sending input | 304 // Make sure Chrome is in the foreground, otherwise sending input |
| 304 // won't do anything and the test will hang. | 305 // won't do anything and the test will hang. |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 353 chrome::NOTIFICATION_FIND_RESULT_AVAILABLE, notification_source); | 354 chrome::NOTIFICATION_FIND_RESULT_AVAILABLE, notification_source); |
| 354 | 355 |
| 355 ASSERT_TRUE(ui_test_utils::SendKeyPressSync( | 356 ASSERT_TRUE(ui_test_utils::SendKeyPressSync( |
| 356 browser(), ui::VKEY_V, true, false, false, false)); | 357 browser(), ui::VKEY_V, true, false, false, false)); |
| 357 | 358 |
| 358 ASSERT_NO_FATAL_FAILURE(observer.Wait()); | 359 ASSERT_NO_FATAL_FAILURE(observer.Wait()); |
| 359 FindNotificationDetails details; | 360 FindNotificationDetails details; |
| 360 ASSERT_TRUE(observer.GetDetailsFor(notification_source.map_key(), &details)); | 361 ASSERT_TRUE(observer.GetDetailsFor(notification_source.map_key(), &details)); |
| 361 EXPECT_TRUE(details.number_of_matches() > 0); | 362 EXPECT_TRUE(details.number_of_matches() > 0); |
| 362 } | 363 } |
| OLD | NEW |