| Index: chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc
|
| diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc
|
| index b64eacea172db254fc36aa6412e6f936507c0f4b..3e97e69f758826296c9a7a78a3929ba6eaaecf33 100644
|
| --- a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc
|
| +++ b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc
|
| @@ -40,16 +40,17 @@ IN_PROC_BROWSER_TEST_F(NewTabUIBrowserTest, ChromeInternalLoadsNTP) {
|
| ASSERT_FALSE(empty_inner_html);
|
| }
|
|
|
| -#if defined(OS_WIN)
|
| -// Flaky on Windows (http://crbug.com/174819)
|
| -#define MAYBE_LoadNTPInExistingProcess DISABLED_LoadNTPInExistingProcess
|
| -#else
|
| -#define MAYBE_LoadNTPInExistingProcess LoadNTPInExistingProcess
|
| -#endif
|
| +// TODO(samarth): delete along with rest of NTP4 code.
|
| +// #if defined(OS_WIN)
|
| +// // Flaky on Windows (http://crbug.com/174819)
|
| +// #define MAYBE_LoadNTPInExistingProcess DISABLED_LoadNTPInExistingProcess
|
| +// #else
|
| +// #define MAYBE_LoadNTPInExistingProcess LoadNTPInExistingProcess
|
| +// #endif
|
|
|
| // Ensure loading a NTP with an existing SiteInstance in a reused process
|
| // doesn't cause us to kill the process. See http://crbug.com/104258.
|
| -IN_PROC_BROWSER_TEST_F(NewTabUIBrowserTest, MAYBE_LoadNTPInExistingProcess) {
|
| +IN_PROC_BROWSER_TEST_F(NewTabUIBrowserTest, DISABLED_LoadNTPInExistingProcess) {
|
| // Set max renderers to 1 to force running out of processes.
|
| content::RenderProcessHost::SetMaxRendererProcessCount(1);
|
|
|
| @@ -109,10 +110,11 @@ IN_PROC_BROWSER_TEST_F(NewTabUIBrowserTest, MAYBE_LoadNTPInExistingProcess) {
|
| browser()->tab_strip_model()->GetWebContentsAt(1)->GetMaxPageID());
|
| }
|
|
|
| +// TODO(samarth): delete along with rest of NTP4 code.
|
| // Loads chrome://hang/ into two NTP tabs, ensuring we don't crash.
|
| // See http://crbug.com/59859.
|
| // If this flakes, use http://crbug.com/87200.
|
| -IN_PROC_BROWSER_TEST_F(NewTabUIBrowserTest, ChromeHangInNTP) {
|
| +IN_PROC_BROWSER_TEST_F(NewTabUIBrowserTest, DISABLED_ChromeHangInNTP) {
|
| // Bring up a new tab page.
|
| ui_test_utils::NavigateToURLWithDisposition(
|
| browser(), GURL(chrome::kChromeUINewTabURL), NEW_FOREGROUND_TAB,
|
|
|