| 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 924 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 935 } | 935 } |
| 936 | 936 |
| 937 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestResizeWebviewResizesContent) { | 937 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestResizeWebviewResizesContent) { |
| 938 TestHelper("testResizeWebviewResizesContent", | 938 TestHelper("testResizeWebviewResizesContent", |
| 939 "web_view/shim", | 939 "web_view/shim", |
| 940 NO_TEST_SERVER); | 940 NO_TEST_SERVER); |
| 941 } | 941 } |
| 942 | 942 |
| 943 // This test makes sure we do not crash if app is closed while interstitial | 943 // This test makes sure we do not crash if app is closed while interstitial |
| 944 // page is being shown in guest. | 944 // page is being shown in guest. |
| 945 // Test flaky on windows; http://crbug.com/297014 . | |
| 946 #if defined(OS_WIN) | |
| 947 #define MAYBE_InterstitialTeardown DISABLED_InterstitialTeardown | |
| 948 #else | |
| 949 #define MAYBE_InterstitialTeardown InterstitialTeardown | |
| 950 #endif | |
| 951 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_InterstitialTeardown) { | 945 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_InterstitialTeardown) { |
| 952 // Start a HTTPS server so we can load an interstitial page inside guest. | 946 // Start a HTTPS server so we can load an interstitial page inside guest. |
| 953 net::SpawnedTestServer::SSLOptions ssl_options; | 947 net::SpawnedTestServer::SSLOptions ssl_options; |
| 954 ssl_options.server_certificate = | 948 ssl_options.server_certificate = |
| 955 net::SpawnedTestServer::SSLOptions::CERT_MISMATCHED_NAME; | 949 net::SpawnedTestServer::SSLOptions::CERT_MISMATCHED_NAME; |
| 956 net::SpawnedTestServer https_server( | 950 net::SpawnedTestServer https_server( |
| 957 net::SpawnedTestServer::TYPE_HTTPS, ssl_options, | 951 net::SpawnedTestServer::TYPE_HTTPS, ssl_options, |
| 958 base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); | 952 base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); |
| 959 ASSERT_TRUE(https_server.Start()); | 953 ASSERT_TRUE(https_server.Start()); |
| 960 | 954 |
| (...skipping 833 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1794 pepper_plugin.append(FILE_PATH_LITERAL(";application/x-ppapi-tests")); | 1788 pepper_plugin.append(FILE_PATH_LITERAL(";application/x-ppapi-tests")); |
| 1795 command_line->AppendSwitchNative(switches::kRegisterPepperPlugins, | 1789 command_line->AppendSwitchNative(switches::kRegisterPepperPlugins, |
| 1796 pepper_plugin); | 1790 pepper_plugin); |
| 1797 } | 1791 } |
| 1798 }; | 1792 }; |
| 1799 | 1793 |
| 1800 IN_PROC_BROWSER_TEST_F(WebViewPluginTest, TestLoadPluginEvent) { | 1794 IN_PROC_BROWSER_TEST_F(WebViewPluginTest, TestLoadPluginEvent) { |
| 1801 TestHelper("testPluginLoadPermission", "web_view/shim", NO_TEST_SERVER); | 1795 TestHelper("testPluginLoadPermission", "web_view/shim", NO_TEST_SERVER); |
| 1802 } | 1796 } |
| 1803 #endif // defined(ENABLE_PLUGINS) | 1797 #endif // defined(ENABLE_PLUGINS) |
| OLD | NEW |