OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "apps/ui/native_app_window.h" | 5 #include "apps/ui/native_app_window.h" |
6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
7 #include "base/strings/stringprintf.h" | 7 #include "base/strings/stringprintf.h" |
8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 #include "chrome/browser/apps/app_browsertest_util.h" | 9 #include "chrome/browser/apps/app_browsertest_util.h" |
10 #include "chrome/browser/automation/automation_util.h" | 10 #include "chrome/browser/automation/automation_util.h" |
(...skipping 929 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
940 } | 940 } |
941 | 941 |
942 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestResizeWebviewResizesContent) { | 942 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestResizeWebviewResizesContent) { |
943 TestHelper("testResizeWebviewResizesContent", | 943 TestHelper("testResizeWebviewResizesContent", |
944 "web_view/shim", | 944 "web_view/shim", |
945 NO_TEST_SERVER); | 945 NO_TEST_SERVER); |
946 } | 946 } |
947 | 947 |
948 // This test makes sure we do not crash if app is closed while interstitial | 948 // This test makes sure we do not crash if app is closed while interstitial |
949 // page is being shown in guest. | 949 // page is being shown in guest. |
950 // Test flaky on windows; http://crbug.com/297014 . | 950 IN_PROC_BROWSER_TEST_F(WebViewTest, InterstitialTeardown) { |
951 #if defined(OS_WIN) | |
952 #define MAYBE_InterstitialTeardown DISABLED_InterstitialTeardown | |
953 #else | |
954 #define MAYBE_InterstitialTeardown InterstitialTeardown | |
955 #endif | |
956 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_InterstitialTeardown) { | |
957 // Start a HTTPS server so we can load an interstitial page inside guest. | 951 // Start a HTTPS server so we can load an interstitial page inside guest. |
958 net::SpawnedTestServer::SSLOptions ssl_options; | 952 net::SpawnedTestServer::SSLOptions ssl_options; |
959 ssl_options.server_certificate = | 953 ssl_options.server_certificate = |
960 net::SpawnedTestServer::SSLOptions::CERT_MISMATCHED_NAME; | 954 net::SpawnedTestServer::SSLOptions::CERT_MISMATCHED_NAME; |
961 net::SpawnedTestServer https_server( | 955 net::SpawnedTestServer https_server( |
962 net::SpawnedTestServer::TYPE_HTTPS, ssl_options, | 956 net::SpawnedTestServer::TYPE_HTTPS, ssl_options, |
963 base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); | 957 base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); |
964 ASSERT_TRUE(https_server.Start()); | 958 ASSERT_TRUE(https_server.Start()); |
965 | 959 |
966 net::HostPortPair host_and_port = https_server.host_port_pair(); | 960 net::HostPortPair host_and_port = https_server.host_port_pair(); |
(...skipping 832 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1799 pepper_plugin.append(FILE_PATH_LITERAL(";application/x-ppapi-tests")); | 1793 pepper_plugin.append(FILE_PATH_LITERAL(";application/x-ppapi-tests")); |
1800 command_line->AppendSwitchNative(switches::kRegisterPepperPlugins, | 1794 command_line->AppendSwitchNative(switches::kRegisterPepperPlugins, |
1801 pepper_plugin); | 1795 pepper_plugin); |
1802 } | 1796 } |
1803 }; | 1797 }; |
1804 | 1798 |
1805 IN_PROC_BROWSER_TEST_F(WebViewPluginTest, TestLoadPluginEvent) { | 1799 IN_PROC_BROWSER_TEST_F(WebViewPluginTest, TestLoadPluginEvent) { |
1806 TestHelper("testPluginLoadPermission", "web_view/shim", NO_TEST_SERVER); | 1800 TestHelper("testPluginLoadPermission", "web_view/shim", NO_TEST_SERVER); |
1807 } | 1801 } |
1808 #endif // defined(ENABLE_PLUGINS) | 1802 #endif // defined(ENABLE_PLUGINS) |
OLD | NEW |