Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3088)

Unified Diff: chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc

Issue 24733003: Update defaults for InstantExtended. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unused. Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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,
« no previous file with comments | « chrome/browser/ui/webui/ntp/new_tab_page_sync_handler_browsertest.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698