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 "base/path_service.h" | 5 #include "base/path_service.h" |
6 #include "base/strings/stringprintf.h" | 6 #include "base/strings/stringprintf.h" |
7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
8 #include "chrome/browser/apps/app_browsertest_util.h" | 8 #include "chrome/browser/apps/app_browsertest_util.h" |
9 #include "chrome/browser/chrome_content_browser_client.h" | 9 #include "chrome/browser/chrome_content_browser_client.h" |
10 #include "chrome/browser/prerender/prerender_link_manager.h" | 10 #include "chrome/browser/prerender/prerender_link_manager.h" |
(...skipping 1164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1175 } | 1175 } |
1176 | 1176 |
1177 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestResizeWebviewResizesContent) { | 1177 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestResizeWebviewResizesContent) { |
1178 TestHelper("testResizeWebviewResizesContent", | 1178 TestHelper("testResizeWebviewResizesContent", |
1179 "web_view/shim", | 1179 "web_view/shim", |
1180 NO_TEST_SERVER); | 1180 NO_TEST_SERVER); |
1181 } | 1181 } |
1182 | 1182 |
1183 // This test makes sure we do not crash if app is closed while interstitial | 1183 // This test makes sure we do not crash if app is closed while interstitial |
1184 // page is being shown in guest. | 1184 // page is being shown in guest. |
1185 // Disabled under LeakSanitizer due to memory leaks. http://crbug.com/321662 | 1185 IN_PROC_BROWSER_TEST_F(WebViewTest, InterstitialTeardown) { |
1186 #if defined(LEAK_SANITIZER) | |
1187 #define MAYBE_InterstitialTeardown DISABLED_InterstitialTeardown | |
1188 #else | |
1189 #define MAYBE_InterstitialTeardown InterstitialTeardown | |
1190 #endif | |
1191 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_InterstitialTeardown) { | |
1192 #if defined(OS_WIN) | 1186 #if defined(OS_WIN) |
1193 // Flaky on XP bot http://crbug.com/297014 | 1187 // Flaky on XP bot http://crbug.com/297014 |
1194 if (base::win::GetVersion() <= base::win::VERSION_XP) | 1188 if (base::win::GetVersion() <= base::win::VERSION_XP) |
1195 return; | 1189 return; |
1196 #endif | 1190 #endif |
1197 | 1191 |
1198 // Start a HTTPS server so we can load an interstitial page inside guest. | 1192 // Start a HTTPS server so we can load an interstitial page inside guest. |
1199 net::SpawnedTestServer::SSLOptions ssl_options; | 1193 net::SpawnedTestServer::SSLOptions ssl_options; |
1200 ssl_options.server_certificate = | 1194 ssl_options.server_certificate = |
1201 net::SpawnedTestServer::SSLOptions::CERT_MISMATCHED_NAME; | 1195 net::SpawnedTestServer::SSLOptions::CERT_MISMATCHED_NAME; |
(...skipping 1070 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2272 // http://crbug.com/403325 | 2266 // http://crbug.com/403325 |
2273 #define MAYBE_WebViewInBackgroundPage \ | 2267 #define MAYBE_WebViewInBackgroundPage \ |
2274 DISABLED_WebViewInBackgroundPage | 2268 DISABLED_WebViewInBackgroundPage |
2275 #else | 2269 #else |
2276 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage | 2270 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage |
2277 #endif | 2271 #endif |
2278 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) { | 2272 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) { |
2279 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background")) | 2273 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background")) |
2280 << message_; | 2274 << message_; |
2281 } | 2275 } |
OLD | NEW |