| 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 <list> | 5 #include <list> |
| 6 #include <set> | 6 #include <set> |
| 7 | 7 |
| 8 #include "base/files/scoped_temp_dir.h" | 8 #include "base/files/scoped_temp_dir.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
| (...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 502 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, MAYBE_Failures) { | 502 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, MAYBE_Failures) { |
| 503 ASSERT_TRUE(StartEmbeddedTestServer()); | 503 ASSERT_TRUE(StartEmbeddedTestServer()); |
| 504 ASSERT_TRUE(RunExtensionTest("webnavigation/failures")) << message_; | 504 ASSERT_TRUE(RunExtensionTest("webnavigation/failures")) << message_; |
| 505 } | 505 } |
| 506 | 506 |
| 507 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, FilteredTest) { | 507 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, FilteredTest) { |
| 508 ASSERT_TRUE(StartEmbeddedTestServer()); | 508 ASSERT_TRUE(StartEmbeddedTestServer()); |
| 509 ASSERT_TRUE(RunExtensionTest("webnavigation/filtered")) << message_; | 509 ASSERT_TRUE(RunExtensionTest("webnavigation/filtered")) << message_; |
| 510 } | 510 } |
| 511 | 511 |
| 512 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, UserAction) { | 512 // Flaky on Windows. See http://crbug.com/662160. |
| 513 #if defined(OS_WIN) |
| 514 #define MAYBE_UserAction DISABLED_UserAction |
| 515 #else |
| 516 #define MAYBE_UserAction UserAction |
| 517 #endif |
| 518 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, MAYBE_UserAction) { |
| 513 content::IsolateAllSitesForTesting(base::CommandLine::ForCurrentProcess()); | 519 content::IsolateAllSitesForTesting(base::CommandLine::ForCurrentProcess()); |
| 514 ASSERT_TRUE(StartEmbeddedTestServer()); | 520 ASSERT_TRUE(StartEmbeddedTestServer()); |
| 515 | 521 |
| 516 // Wait for the extension to set itself up and return control to us. | 522 // Wait for the extension to set itself up and return control to us. |
| 517 ASSERT_TRUE(RunExtensionTest("webnavigation/userAction")) << message_; | 523 ASSERT_TRUE(RunExtensionTest("webnavigation/userAction")) << message_; |
| 518 | 524 |
| 519 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); | 525 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); |
| 520 content::WaitForLoadStop(tab); | 526 content::WaitForLoadStop(tab); |
| 521 | 527 |
| 522 ResultCatcher catcher; | 528 ResultCatcher catcher; |
| (...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 803 "extensions/api_test/webnavigation/crash/b.html", | 809 "extensions/api_test/webnavigation/crash/b.html", |
| 804 embedded_test_server()->port())); | 810 embedded_test_server()->port())); |
| 805 ui_test_utils::NavigateToURL(browser(), url); | 811 ui_test_utils::NavigateToURL(browser(), url); |
| 806 | 812 |
| 807 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 813 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
| 808 } | 814 } |
| 809 | 815 |
| 810 #endif | 816 #endif |
| 811 | 817 |
| 812 } // namespace extensions | 818 } // namespace extensions |
| OLD | NEW |