| 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 387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 398 ASSERT_TRUE(StartEmbeddedTestServer()); | 398 ASSERT_TRUE(StartEmbeddedTestServer()); |
| 399 ASSERT_TRUE(RunExtensionTest("webnavigation/getFrame")) << message_; | 399 ASSERT_TRUE(RunExtensionTest("webnavigation/getFrame")) << message_; |
| 400 } | 400 } |
| 401 | 401 |
| 402 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, ClientRedirect) { | 402 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, ClientRedirect) { |
| 403 ASSERT_TRUE(StartEmbeddedTestServer()); | 403 ASSERT_TRUE(StartEmbeddedTestServer()); |
| 404 ASSERT_TRUE(RunExtensionTest("webnavigation/clientRedirect")) | 404 ASSERT_TRUE(RunExtensionTest("webnavigation/clientRedirect")) |
| 405 << message_; | 405 << message_; |
| 406 } | 406 } |
| 407 | 407 |
| 408 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, ServerRedirect) { | 408 #if defined(OS_LINUX) // http://crbug.com/660288 |
| 409 #define MAYBE_ServerRedirect DISABLED_ServerRedirect |
| 410 #else |
| 411 #define MAYBE_ServerRedirect ServerRedirect |
| 412 #endif |
| 413 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, MAYBE_ServerRedirect) { |
| 409 ASSERT_TRUE(StartEmbeddedTestServer()); | 414 ASSERT_TRUE(StartEmbeddedTestServer()); |
| 410 ASSERT_TRUE(RunExtensionTest("webnavigation/serverRedirect")) | 415 ASSERT_TRUE(RunExtensionTest("webnavigation/serverRedirect")) |
| 411 << message_; | 416 << message_; |
| 412 } | 417 } |
| 413 | 418 |
| 414 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, Download) { | 419 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, Download) { |
| 415 base::ScopedTempDir download_directory; | 420 base::ScopedTempDir download_directory; |
| 416 ASSERT_TRUE(download_directory.CreateUniqueTempDir()); | 421 ASSERT_TRUE(download_directory.CreateUniqueTempDir()); |
| 417 DownloadPrefs* download_prefs = | 422 DownloadPrefs* download_prefs = |
| 418 DownloadPrefs::FromBrowserContext(browser()->profile()); | 423 DownloadPrefs::FromBrowserContext(browser()->profile()); |
| (...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 798 "extensions/api_test/webnavigation/crash/b.html", | 803 "extensions/api_test/webnavigation/crash/b.html", |
| 799 embedded_test_server()->port())); | 804 embedded_test_server()->port())); |
| 800 ui_test_utils::NavigateToURL(browser(), url); | 805 ui_test_utils::NavigateToURL(browser(), url); |
| 801 | 806 |
| 802 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 807 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
| 803 } | 808 } |
| 804 | 809 |
| 805 #endif | 810 #endif |
| 806 | 811 |
| 807 } // namespace extensions | 812 } // namespace extensions |
| OLD | NEW |