| Index: chrome/browser/ui/browser_browsertest.cc
|
| diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
|
| index e3ddce8092895970a1bd17fd0c60f605b31fd88e..f8fbb05a5430dff9e412ffef7496d77b80439532 100644
|
| --- a/chrome/browser/ui/browser_browsertest.cc
|
| +++ b/chrome/browser/ui/browser_browsertest.cc
|
| @@ -783,22 +783,11 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CancelBeforeUnloadResetsURL) {
|
| ExecuteJavaScript(ASCIIToUTF16("onbeforeunload=null;"));
|
| }
|
|
|
| -// Crashy on mac. http://crbug.com/38522 Crashy on win too (after 3 years).
|
| -// Flaky timeouts on a MemorySanitizer bot. http://crbug.com/410891
|
| -#if defined(OS_MACOSX) || \
|
| - defined(OS_WIN) || \
|
| - defined(MEMORY_SANITIZER) || \
|
| - defined(ADDRESS_SANITIZER)
|
| -#define MAYBE_SingleBeforeUnloadAfterWindowClose \
|
| - DISABLED_SingleBeforeUnloadAfterWindowClose
|
| -#else
|
| -#define MAYBE_SingleBeforeUnloadAfterWindowClose \
|
| - SingleBeforeUnloadAfterWindowClose
|
| -#endif
|
| -
|
| // Test for crbug.com/11647. A page closed with window.close() should not have
|
| // two beforeunload dialogs shown.
|
| -IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_SingleBeforeUnloadAfterWindowClose) {
|
| +// http://crbug.com/410891
|
| +IN_PROC_BROWSER_TEST_F(BrowserTest,
|
| + DISABLED_SingleBeforeUnloadAfterWindowClose) {
|
| browser()->tab_strip_model()->GetActiveWebContents()->GetMainFrame()->
|
| ExecuteJavaScriptForTests(ASCIIToUTF16(kOpenNewBeforeUnloadPage));
|
|
|
|
|