Make old task manager tests work against new task manager.

chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/task_manager/task_manager_browsertest_util.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 73 matching lines @@
             chrome::IsCommandEnabled(browser(), IDC_BASIC_PRINT));
 }
 
 // Disable the test for mac, see http://crbug/367665.
 #if defined(OS_MACOSX) || defined(OS_LINUX)
 #define MAYBE_TaskManagerNewPrintPreview DISABLED_TaskManagerNewPrintPreview
 #else
 #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()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnyPrint()));
 
   // Create the print preview dialog.
   Print();
 
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyPrint()));
   ASSERT_NO_FATAL_FAILURE(
       WaitForTaskManagerRows(1, MatchPrint(url::kAboutBlankURL)));
 }
 
 // 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();
 
   chrome::ShowTaskManager(browser());  // Show task manager AFTER print dialog.
 
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyPrint()));
   ASSERT_NO_FATAL_FAILURE(
       WaitForTaskManagerRows(1, MatchPrint(url::kAboutBlankURL)));
@@ skipping 12 matching lines @@
   browser()->tab_strip_model()->ActivateTabAt(0, true);
 
   // Navigate main tab to hide print preview.
   ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));
 
   browser()->tab_strip_model()->ActivateTabAt(1, true);
 }
 #endif  // defined(OS_WIN)
 
 }  // namespace