| Index: trunk/src/chrome/browser/captive_portal/captive_portal_browsertest.cc
|
| ===================================================================
|
| --- trunk/src/chrome/browser/captive_portal/captive_portal_browsertest.cc (revision 197141)
|
| +++ trunk/src/chrome/browser/captive_portal/captive_portal_browsertest.cc (working copy)
|
| @@ -1887,8 +1887,7 @@
|
| }
|
|
|
| // Fails on Windows only, mostly on Win7. http://crbug.com/170033
|
| -// Fails on Mac with assert. http://crbug.com/236118
|
| -#if defined(OS_WIN) || defined(OS_MACOSX)
|
| +#if defined(OS_WIN)
|
| #define MAYBE_NavigateLoadingTabToTimeoutTwoSites \
|
| DISABLED_NavigateLoadingTabToTimeoutTwoSites
|
| #else
|
|
|