| 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 <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/files/file_util.h" | 8 #include "base/files/file_util.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
| (...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 305 // Disabled due to crbug.com/175711 and http://crbug.com/419987 | 305 // Disabled due to crbug.com/175711 and http://crbug.com/419987 |
| 306 #define MAYBE_SearchWithinSpecialURL \ | 306 #define MAYBE_SearchWithinSpecialURL \ |
| 307 DISABLED_SearchWithinSpecialURL | 307 DISABLED_SearchWithinSpecialURL |
| 308 #else | 308 #else |
| 309 #define MAYBE_SearchWithinSpecialURL \ | 309 #define MAYBE_SearchWithinSpecialURL \ |
| 310 SearchWithinSpecialURL | 310 SearchWithinSpecialURL |
| 311 #endif | 311 #endif |
| 312 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, MAYBE_SearchWithinSpecialURL) { | 312 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, MAYBE_SearchWithinSpecialURL) { |
| 313 // TODO(tsergeant): Get this test working on MD History, which loads very | 313 // TODO(tsergeant): Get this test working on MD History, which loads very |
| 314 // asynchronously and causes this test to fail. | 314 // asynchronously and causes this test to fail. |
| 315 MdHistoryUI::DisableForTesting(); | 315 MdHistoryUI::SetEnabledForTesting(false); |
| 316 | 316 |
| 317 WebContents* web_contents = | 317 WebContents* web_contents = |
| 318 browser()->tab_strip_model()->GetActiveWebContents(); | 318 browser()->tab_strip_model()->GetActiveWebContents(); |
| 319 | 319 |
| 320 base::FilePath data_dir = | 320 base::FilePath data_dir = |
| 321 ui_test_utils::GetTestFilePath(base::FilePath(), base::FilePath()); | 321 ui_test_utils::GetTestFilePath(base::FilePath(), base::FilePath()); |
| 322 ui_test_utils::NavigateToURL(browser(), net::FilePathToFileURL(data_dir)); | 322 ui_test_utils::NavigateToURL(browser(), net::FilePathToFileURL(data_dir)); |
| 323 EXPECT_EQ(1, FindInPageASCII(web_contents, "downloads", | 323 EXPECT_EQ(1, FindInPageASCII(web_contents, "downloads", |
| 324 kFwd, kIgnoreCase, NULL)); | 324 kFwd, kIgnoreCase, NULL)); |
| 325 | 325 |
| (...skipping 1227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1553 | 1553 |
| 1554 EXPECT_TRUE(chrome::ExecuteCommand(browser_incognito, IDC_FIND_NEXT)); | 1554 EXPECT_TRUE(chrome::ExecuteCommand(browser_incognito, IDC_FIND_NEXT)); |
| 1555 WebContents* web_contents_incognito = | 1555 WebContents* web_contents_incognito = |
| 1556 browser_incognito->tab_strip_model()->GetActiveWebContents(); | 1556 browser_incognito->tab_strip_model()->GetActiveWebContents(); |
| 1557 ui_test_utils::FindInPageNotificationObserver observer( | 1557 ui_test_utils::FindInPageNotificationObserver observer( |
| 1558 web_contents_incognito); | 1558 web_contents_incognito); |
| 1559 observer.Wait(); | 1559 observer.Wait(); |
| 1560 EXPECT_EQ(ASCIIToUTF16("bar"), | 1560 EXPECT_EQ(ASCIIToUTF16("bar"), |
| 1561 GetFindBarTextForBrowser(browser_incognito)); | 1561 GetFindBarTextForBrowser(browser_incognito)); |
| 1562 } | 1562 } |
| OLD | NEW |