| Index: content/browser/site_per_process_browsertest.cc
|
| diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc
|
| index 17e60f38f89d59b372f8407c3671a61fbbf2e716..c3a1855dea445e07a0283b542b375d4481b388ba 100644
|
| --- a/content/browser/site_per_process_browsertest.cc
|
| +++ b/content/browser/site_per_process_browsertest.cc
|
| @@ -5996,8 +5996,14 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
|
| // displayed in an OOPIF. The test ignores cert errors so that an HTTPS
|
| // iframe can be loaded from a site other than localhost (the
|
| // EmbeddedTestServer serves a certificate that is valid for localhost).
|
| +// This test crashes on Windows under Dr. Memory, see https://crbug.com/600942.
|
| +#if defined(OS_WIN)
|
| +#define MAYBE_PassiveMixedContentInIframe DISABLED_PassiveMixedContentInIframe
|
| +#else
|
| +#define MAYBE_PassiveMixedContentInIframe PassiveMixedContentInIframe
|
| +#endif
|
| IN_PROC_BROWSER_TEST_F(SitePerProcessIgnoreCertErrorsBrowserTest,
|
| - PassiveMixedContentInIframe) {
|
| + MAYBE_PassiveMixedContentInIframe) {
|
| net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS);
|
| https_server.ServeFilesFromSourceDirectory("content/test/data");
|
| ASSERT_TRUE(https_server.Start());
|
|
|