| 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 1199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1210 } | 1210 } |
| 1211 | 1211 |
| 1212 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestResizeWebviewResizesContent) { | 1212 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestResizeWebviewResizesContent) { |
| 1213 TestHelper("testResizeWebviewResizesContent", | 1213 TestHelper("testResizeWebviewResizesContent", |
| 1214 "web_view/shim", | 1214 "web_view/shim", |
| 1215 NO_TEST_SERVER); | 1215 NO_TEST_SERVER); |
| 1216 } | 1216 } |
| 1217 | 1217 |
| 1218 // This test makes sure we do not crash if app is closed while interstitial | 1218 // This test makes sure we do not crash if app is closed while interstitial |
| 1219 // page is being shown in guest. | 1219 // page is being shown in guest. |
| 1220 // Disabled under LeakSanitizer due to memory leaks. http://crbug.com/321662 | 1220 IN_PROC_BROWSER_TEST_F(WebViewTest, InterstitialTeardown) { |
| 1221 #if defined(LEAK_SANITIZER) | |
| 1222 #define MAYBE_InterstitialTeardown DISABLED_InterstitialTeardown | |
| 1223 #else | |
| 1224 #define MAYBE_InterstitialTeardown InterstitialTeardown | |
| 1225 #endif | |
| 1226 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_InterstitialTeardown) { | |
| 1227 #if defined(OS_WIN) | 1221 #if defined(OS_WIN) |
| 1228 // Flaky on XP bot http://crbug.com/297014 | 1222 // Flaky on XP bot http://crbug.com/297014 |
| 1229 if (base::win::GetVersion() <= base::win::VERSION_XP) | 1223 if (base::win::GetVersion() <= base::win::VERSION_XP) |
| 1230 return; | 1224 return; |
| 1231 #endif | 1225 #endif |
| 1232 | 1226 |
| 1233 // Start a HTTPS server so we can load an interstitial page inside guest. | 1227 // Start a HTTPS server so we can load an interstitial page inside guest. |
| 1234 net::SpawnedTestServer::SSLOptions ssl_options; | 1228 net::SpawnedTestServer::SSLOptions ssl_options; |
| 1235 ssl_options.server_certificate = | 1229 ssl_options.server_certificate = |
| 1236 net::SpawnedTestServer::SSLOptions::CERT_MISMATCHED_NAME; | 1230 net::SpawnedTestServer::SSLOptions::CERT_MISMATCHED_NAME; |
| (...skipping 1070 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2307 // http://crbug.com/403325 | 2301 // http://crbug.com/403325 |
| 2308 #define MAYBE_WebViewInBackgroundPage \ | 2302 #define MAYBE_WebViewInBackgroundPage \ |
| 2309 DISABLED_WebViewInBackgroundPage | 2303 DISABLED_WebViewInBackgroundPage |
| 2310 #else | 2304 #else |
| 2311 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage | 2305 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage |
| 2312 #endif | 2306 #endif |
| 2313 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) { | 2307 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) { |
| 2314 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background")) | 2308 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background")) |
| 2315 << message_; | 2309 << message_; |
| 2316 } | 2310 } |
| OLD | NEW |