| Index: chrome/browser/prerender/prerender_browsertest.cc
|
| diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
|
| index a2686a91aa6dd7811770009a4606e26d2d20dd92..a7d75337968ff2fe114c5ce9546043403056f934 100644
|
| --- a/chrome/browser/prerender/prerender_browsertest.cc
|
| +++ b/chrome/browser/prerender/prerender_browsertest.cc
|
| @@ -1285,9 +1285,15 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderVisibility) {
|
| NavigateToDestURL();
|
| }
|
|
|
| +// crbug.com/708158
|
| +#if defined(OS_MACOSX) && defined(ADDRESS_SANITIZER)
|
| +#define MAYBE_PrerenderNoCommitNoSwap DISABLED_PrerenderNoCommitNoSwap
|
| +#else
|
| +#define MAYBE_PrerenderNoCommitNoSwap PrerenderNoCommitNoSwap
|
| +#endif
|
| // Checks that the prerendering of a page is canceled correctly if we try to
|
| // swap it in before it commits.
|
| -IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderNoCommitNoSwap) {
|
| +IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, MAYBE_PrerenderNoCommitNoSwap) {
|
| // Navigate to a page that triggers a prerender for a URL that never commits.
|
| const GURL kNoCommitUrl("http://never-respond.example.com");
|
| base::FilePath file(GetTestPath("prerender_page.html"));
|
| @@ -1308,8 +1314,14 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderNoCommitNoSwap) {
|
| NavigateToDestURLWithDisposition(WindowOpenDisposition::CURRENT_TAB, false);
|
| }
|
|
|
| +// crbug.com/708158
|
| +#if defined(OS_MACOSX) && defined(ADDRESS_SANITIZER)
|
| +#define MAYBE_PrerenderNoCommitNoSwap2 DISABLED_PrerenderNoCommitNoSwap2
|
| +#else
|
| +#define MAYBE_PrerenderNoCommitNoSwap2 PrerenderNoCommitNoSwap2
|
| +#endif
|
| // Checks that client redirects don't add alias URLs until after they commit.
|
| -IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderNoCommitNoSwap2) {
|
| +IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, MAYBE_PrerenderNoCommitNoSwap2) {
|
| // Navigate to a page that then navigates to a URL that never commits.
|
| const GURL kNoCommitUrl("http://never-respond.example.com");
|
| base::FilePath file(GetTestPath("prerender_page.html"));
|
|
|