| Index: chrome/browser/prerender/prerender_browsertest.cc
|
| diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
|
| index fc1cde6a409e5ccf1d2e377837ce76728b40cc81..a2686a91aa6dd7811770009a4606e26d2d20dd92 100644
|
| --- a/chrome/browser/prerender/prerender_browsertest.cc
|
| +++ b/chrome/browser/prerender/prerender_browsertest.cc
|
| @@ -2026,20 +2026,34 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
|
| ASSERT_TRUE(IsEmptyPrerenderLinkManager());
|
| }
|
|
|
| +// crbug.com/708158
|
| +#if defined(OS_MACOSX) && defined(ADDRESS_SANITIZER)
|
| +#define MAYBE_PrerenderPageNavigateFragment \
|
| + DISABLED_PrerenderPageNavigateFragment
|
| +#else
|
| +#define MAYBE_PrerenderPageNavigateFragment PrerenderPageNavigateFragment
|
| +#endif
|
| // Checks that we do not use a prerendered page when navigating from
|
| // the main page to a fragment.
|
| IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
|
| - PrerenderPageNavigateFragment) {
|
| + MAYBE_PrerenderPageNavigateFragment) {
|
| PrerenderTestURL("/prerender/no_prerender_page.html",
|
| FINAL_STATUS_APP_TERMINATING, 1);
|
| NavigateToURLWithDisposition("/prerender/no_prerender_page.html#fragment",
|
| WindowOpenDisposition::CURRENT_TAB, false);
|
| }
|
|
|
| +// crbug.com/708158
|
| +#if defined(OS_MACOSX) && defined(ADDRESS_SANITIZER)
|
| +#define MAYBE_PrerenderFragmentNavigatePage \
|
| + DISABLED_PrerenderFragmentNavigatePage
|
| +#else
|
| +#define MAYBE_PrerenderFragmentNavigatePage PrerenderFragmentNavigatePage
|
| +#endif
|
| // Checks that we do not use a prerendered page when we prerender a fragment
|
| // but navigate to the main page.
|
| IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
|
| - PrerenderFragmentNavigatePage) {
|
| + MAYBE_PrerenderFragmentNavigatePage) {
|
| PrerenderTestURL("/prerender/no_prerender_page.html#fragment",
|
| FINAL_STATUS_APP_TERMINATING, 1);
|
| NavigateToURLWithDisposition("/prerender/no_prerender_page.html",
|
| @@ -3070,8 +3084,15 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderDeferredSynchronousXHR) {
|
| ui_test_utils::NavigateToURL(current_browser(), dest_url());
|
| }
|
|
|
| +// crbug.com/708158
|
| +#if defined(OS_MACOSX) && defined(ADDRESS_SANITIZER)
|
| +#define MAYBE_PrerenderExtraHeadersNoSwap DISABLED_PrerenderExtraHeadersNoSwap
|
| +#else
|
| +#define MAYBE_PrerenderExtraHeadersNoSwap PrerenderExtraHeadersNoSwap
|
| +#endif
|
| // Checks that prerenders are not swapped for navigations with extra headers.
|
| -IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderExtraHeadersNoSwap) {
|
| +IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
|
| + MAYBE_PrerenderExtraHeadersNoSwap) {
|
| PrerenderTestURL("/prerender/prerender_page.html",
|
| FINAL_STATUS_APP_TERMINATING, 1);
|
|
|
|
|