| 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/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
| (...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 392 ASSERT_TRUE(StartEmbeddedTestServer()); | 392 ASSERT_TRUE(StartEmbeddedTestServer()); |
| 393 ASSERT_TRUE(RunExtensionTest("webnavigation/getFrame")) << message_; | 393 ASSERT_TRUE(RunExtensionTest("webnavigation/getFrame")) << message_; |
| 394 } | 394 } |
| 395 | 395 |
| 396 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, ClientRedirect) { | 396 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, ClientRedirect) { |
| 397 ASSERT_TRUE(StartEmbeddedTestServer()); | 397 ASSERT_TRUE(StartEmbeddedTestServer()); |
| 398 ASSERT_TRUE(RunExtensionTest("webnavigation/clientRedirect")) | 398 ASSERT_TRUE(RunExtensionTest("webnavigation/clientRedirect")) |
| 399 << message_; | 399 << message_; |
| 400 } | 400 } |
| 401 | 401 |
| 402 #if defined(OS_LINUX) // http://crbug.com/660288 | 402 // http://crbug.com/660288 |
| 403 #define MAYBE_ServerRedirect DISABLED_ServerRedirect | 403 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, DISABLED_ServerRedirect) { |
| 404 #else | |
| 405 #define MAYBE_ServerRedirect ServerRedirect | |
| 406 #endif | |
| 407 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, MAYBE_ServerRedirect) { | |
| 408 ASSERT_TRUE(StartEmbeddedTestServer()); | 404 ASSERT_TRUE(StartEmbeddedTestServer()); |
| 409 ASSERT_TRUE(RunExtensionTest("webnavigation/serverRedirect")) | 405 ASSERT_TRUE(RunExtensionTest("webnavigation/serverRedirect")) |
| 410 << message_; | 406 << message_; |
| 411 } | 407 } |
| 412 | 408 |
| 413 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, Download) { | 409 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, Download) { |
| 414 base::ScopedTempDir download_directory; | 410 base::ScopedTempDir download_directory; |
| 415 ASSERT_TRUE(download_directory.CreateUniqueTempDir()); | 411 ASSERT_TRUE(download_directory.CreateUniqueTempDir()); |
| 416 DownloadPrefs* download_prefs = | 412 DownloadPrefs* download_prefs = |
| 417 DownloadPrefs::FromBrowserContext(browser()->profile()); | 413 DownloadPrefs::FromBrowserContext(browser()->profile()); |
| (...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 811 "extensions/api_test/webnavigation/crash/b.html", | 807 "extensions/api_test/webnavigation/crash/b.html", |
| 812 embedded_test_server()->port())); | 808 embedded_test_server()->port())); |
| 813 ui_test_utils::NavigateToURL(browser(), url); | 809 ui_test_utils::NavigateToURL(browser(), url); |
| 814 | 810 |
| 815 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 811 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
| 816 } | 812 } |
| 817 | 813 |
| 818 #endif | 814 #endif |
| 819 | 815 |
| 820 } // namespace extensions | 816 } // namespace extensions |
| OLD | NEW |