| Index: chrome/browser/crash_recovery_browsertest.cc
|
| ===================================================================
|
| --- chrome/browser/crash_recovery_browsertest.cc (revision 33703)
|
| +++ chrome/browser/crash_recovery_browsertest.cc (working copy)
|
| @@ -57,8 +57,18 @@
|
| class CrashRecoveryBrowserTest : public InProcessBrowserTest {
|
| };
|
|
|
| +// http://crbug.com/29331 - Causes an OS crash dialog in release mode, needs to
|
| +// be fixed before it can be enabled to not cause the bots issues.
|
| +#if defined(OS_MACOSX)
|
| +#define MAYBE_Reload DISABLED_Reload
|
| +#define MAYBE_LoadInNewTab DISABLED_LoadInNewTab
|
| +#else
|
| +#define MAYBE_Reload Reload
|
| +#define MAYBE_LoadInNewTab LoadInNewTab
|
| +#endif
|
| +
|
| // Test that reload works after a crash.
|
| -IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, Reload) {
|
| +IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, MAYBE_Reload) {
|
| // The title of the active tab should change each time this URL is loaded.
|
| GURL url(
|
| "data:text/html,<script>document.title=new Date().valueOf()</script>");
|
| @@ -81,7 +91,7 @@
|
| // There was an earlier bug (1270510) in process-per-site in which the max page
|
| // ID of the RenderProcessHost was stale, so the NavigationEntry in the new tab
|
| // was not committed. This prevents regression of that bug.
|
| -IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, LoadInNewTab) {
|
| +IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, MAYBE_LoadInNewTab) {
|
| ui_test_utils::NavigateToURL(browser(),
|
| ui_test_utils::GetTestUrl(L".", L"title2.html"));
|
|
|
|
|