| Index: chrome/browser/chrome_site_per_process_browsertest.cc
|
| diff --git a/chrome/browser/chrome_site_per_process_browsertest.cc b/chrome/browser/chrome_site_per_process_browsertest.cc
|
| index de4374a469d5eb0f8268a137353cc3bfd927c6ff..6c45c0a1a276ba2e658225e837be03836a7eddcf 100644
|
| --- a/chrome/browser/chrome_site_per_process_browsertest.cc
|
| +++ b/chrome/browser/chrome_site_per_process_browsertest.cc
|
| @@ -100,8 +100,16 @@ double GetFrameDeviceScaleFactor(const content::ToRenderFrameHost& adapter) {
|
| return device_scale_factor;
|
| }
|
|
|
| +// Flaky on Windows 10. http://crbug.com/700150
|
| +#if defined(OS_WIN)
|
| +#define MAYBE_InterstitialLoadsWithCorrectDeviceScaleFactor \
|
| + DISABLED_InterstitialLoadsWithCorrectDeviceScaleFactor
|
| +#else
|
| +#define MAYBE_InterstitialLoadsWithCorrectDeviceScaleFactor \
|
| + InterstitialLoadsWithCorrectDeviceScaleFactor
|
| +#endif
|
| IN_PROC_BROWSER_TEST_F(SitePerProcessHighDPIExpiredCertBrowserTest,
|
| - InterstitialLoadsWithCorrectDeviceScaleFactor) {
|
| + MAYBE_InterstitialLoadsWithCorrectDeviceScaleFactor) {
|
| GURL main_url(embedded_test_server()->GetURL(
|
| "a.com", "/cross_site_iframe_factory.html?a(b)"));
|
| ui_test_utils::NavigateToURL(browser(), main_url);
|
|
|