| 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 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 267 | 267 |
| 268 Checkpoint("Validate", start_time); | 268 Checkpoint("Validate", start_time); |
| 269 | 269 |
| 270 // After the Find box has been reopened, it should still have no prepopulate | 270 // After the Find box has been reopened, it should still have no prepopulate |
| 271 // value. | 271 // value. |
| 272 EXPECT_EQ(string16(), GetFindBarText()); | 272 EXPECT_EQ(string16(), GetFindBarText()); |
| 273 | 273 |
| 274 Checkpoint("Test done", start_time); | 274 Checkpoint("Test done", start_time); |
| 275 } | 275 } |
| 276 | 276 |
| 277 IN_PROC_BROWSER_TEST_F(FindInPageTest, PasteWithoutTextChange) { | 277 // Flaky on Win. http://crbug.com/92467 |
| 278 #if defined(OS_WIN) |
| 279 #define MAYBE_PasteWithoutTextChange FLAKY_PasteWithoutTextChange |
| 280 #else |
| 281 #define MAYBE_PasteWithoutTextChange PasteWithoutTextChange |
| 282 #endif |
| 283 |
| 284 IN_PROC_BROWSER_TEST_F(FindInPageTest, MAYBE_PasteWithoutTextChange) { |
| 278 ASSERT_TRUE(test_server()->Start()); | 285 ASSERT_TRUE(test_server()->Start()); |
| 279 | 286 |
| 280 // Make sure Chrome is in the foreground, otherwise sending input | 287 // Make sure Chrome is in the foreground, otherwise sending input |
| 281 // won't do anything and the test will hang. | 288 // won't do anything and the test will hang. |
| 282 ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); | 289 ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); |
| 283 | 290 |
| 284 // First we navigate to any page. | 291 // First we navigate to any page. |
| 285 GURL url = test_server()->GetURL(kSimplePage); | 292 GURL url = test_server()->GetURL(kSimplePage); |
| 286 ui_test_utils::NavigateToURL(browser(), url); | 293 ui_test_utils::NavigateToURL(browser(), url); |
| 287 | 294 |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 329 chrome::NOTIFICATION_FIND_RESULT_AVAILABLE, notification_source); | 336 chrome::NOTIFICATION_FIND_RESULT_AVAILABLE, notification_source); |
| 330 | 337 |
| 331 ASSERT_TRUE(ui_test_utils::SendKeyPressSync( | 338 ASSERT_TRUE(ui_test_utils::SendKeyPressSync( |
| 332 browser(), ui::VKEY_V, true, false, false, false)); | 339 browser(), ui::VKEY_V, true, false, false, false)); |
| 333 | 340 |
| 334 ASSERT_NO_FATAL_FAILURE(observer.Wait()); | 341 ASSERT_NO_FATAL_FAILURE(observer.Wait()); |
| 335 FindNotificationDetails details; | 342 FindNotificationDetails details; |
| 336 ASSERT_TRUE(observer.GetDetailsFor(notification_source.map_key(), &details)); | 343 ASSERT_TRUE(observer.GetDetailsFor(notification_source.map_key(), &details)); |
| 337 EXPECT_TRUE(details.number_of_matches() > 0); | 344 EXPECT_TRUE(details.number_of_matches() > 0); |
| 338 } | 345 } |
| OLD | NEW |