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

Unified Diff: chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc

Issue 1293813005: Change the new-task-manager flag so that the new implementation is enabled by default for all users. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix comment Created 5 years, 4 months 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
« no previous file with comments | « chrome/browser/task_manager/task_manager_browsertest_util.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc
index a72c0538f3b38ff61633842e3a64066c7a89e922..b4cee6a888217d282bf4cb9a3f2625ee57b1aa9d 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc
@@ -90,6 +90,10 @@ IN_PROC_BROWSER_TEST_F(PrintPreviewTest, PrintCommands) {
#define MAYBE_TaskManagerNewPrintPreview TaskManagerNewPrintPreview
#endif
IN_PROC_BROWSER_TEST_F(PrintPreviewTest, MAYBE_TaskManagerNewPrintPreview) {
+ // This test is for the old implementation of the task manager. We must
+ // explicitly disable the new one.
+ task_manager::browsertest_util::EnableOldTaskManager();
+
chrome::ShowTaskManager(browser()); // Show task manager BEFORE print dialog.
ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab()));
@@ -109,6 +113,10 @@ IN_PROC_BROWSER_TEST_F(PrintPreviewTest, MAYBE_TaskManagerNewPrintPreview) {
// http://crbug/367665.
IN_PROC_BROWSER_TEST_F(PrintPreviewTest,
DISABLED_TaskManagerExistingPrintPreview) {
+ // This test is for the old implementation of the task manager. We must
+ // explicitly disable the new one.
+ task_manager::browsertest_util::EnableOldTaskManager();
+
// Create the print preview dialog.
Print();
« no previous file with comments | « chrome/browser/task_manager/task_manager_browsertest_util.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698