| 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 d38a82da801493d4c2b5ca8c5ff84c261b060c71..a0a459ea82ff7cbade6e5954d281926fe73f41c9 100644
|
| --- a/content/browser/site_per_process_browsertest.cc
|
| +++ b/content/browser/site_per_process_browsertest.cc
|
| @@ -654,7 +654,9 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
|
| // created in the FrameTree skipping the subtree of the navigating frame.
|
| // TODO(nasko): Test is disabled on Android, because it times out. It should
|
| // be fixed together with CrossSiteIframe on that platform.
|
| -#if defined(OS_ANDROID)
|
| +//
|
| +// Disabled on Mac due to flakiness on ASAN. http://crbug.com/425248
|
| +#if defined(OS_ANDROID) || defined(OS_MACOSX)
|
| #define MAYBE_ProxyCreationSkipsSubtree DISABLED_ProxyCreationSkipsSubtree
|
| #else
|
| #define MAYBE_ProxyCreationSkipsSubtree ProxyCreationSkipsSubtree
|
|
|