Change the new-task-manager flag so that the new implementation is enabled by default for all users.

chrome/browser/prerender/prerender_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 <deque>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 2471 matching lines @@
 
   // Cancel the prerender.
   GetPrerenderManager()->CancelAllPrerenders();
   prerender->WaitForStop();
 
   // All prerenders are now gone.
   EXPECT_TRUE(IsEmptyPrerenderLinkManager());
 }
 
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, OpenTaskManagerBeforePrerender) {
+  // This test is for the old implementation of the task manager. We must
+  // explicitly disable the new one.
+  task_manager::browsertest_util::EnableOldTaskManager();
+
   const base::string16 any_prerender = MatchTaskManagerPrerender("*");
   const base::string16 any_tab = MatchTaskManagerTab("*");
   const base::string16 original = MatchTaskManagerTab("Preloader");
   const base::string16 prerender = MatchTaskManagerPrerender("Prerender Page");
   const base::string16 final = MatchTaskManagerTab("Prerender Page");
 
   // Show the task manager. This populates the model.
   chrome::OpenTaskManager(current_browser());
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, any_tab));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, any_prerender));
@@ skipping 15 matching lines @@
   // The "Prerender: " TaskManager entry should disappear, being replaced by a
   // "Tab: Prerender Page" entry, and nothing else.
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, prerender));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, original));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, final));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, any_tab));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, any_prerender));
 }
 
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, OpenTaskManagerAfterPrerender) {
+  // This test is for the old implementation of the task manager. We must
+  // explicitly disable the new one.
+  task_manager::browsertest_util::EnableOldTaskManager();
+
   const base::string16 any_prerender = MatchTaskManagerPrerender("*");
   const base::string16 any_tab = MatchTaskManagerTab("*");
   const base::string16 original = MatchTaskManagerTab("Preloader");
   const base::string16 prerender = MatchTaskManagerPrerender("Prerender Page");
   const base::string16 final = MatchTaskManagerTab("Prerender Page");
 
   // Start with two resources.
   PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1);
 
   // Show the task manager. This populates the model. Importantly, we're doing
@@ skipping 14 matching lines @@
   // The "Prerender: Prerender Page" TaskManager row should disappear, being
   // replaced by "Tab: Prerender Page"
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, prerender));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, original));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, final));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, any_tab));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, any_prerender));
 }
 
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, OpenTaskManagerAfterSwapIn) {
+  // This test is for the old implementation of the task manager. We must
+  // explicitly disable the new one.
+  task_manager::browsertest_util::EnableOldTaskManager();
+
   const base::string16 any_prerender = MatchTaskManagerPrerender("*");
   const base::string16 any_tab = MatchTaskManagerTab("*");
   const base::string16 final = MatchTaskManagerTab("Prerender Page");
 
   // Prerender, and swap it in.
   PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1);
   NavigateToDestURL();
 
   // Show the task manager. This populates the model. Importantly, we're doing
   // this after the prerender has been swapped in.
@@ skipping 1575 matching lines @@
 
   NavigateToDestURL();
   EXPECT_EQ(1U, task_manager.tasks().size());
 }
 
 }  // namespace
 
 #endif  // defined(ENABLE_TASK_MANAGER)
 
 }  // namespace prerender