Make old task manager tests work against new task manager.

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 <stddef.h>
 #include <deque>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 2457 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("/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("/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 1429 matching lines @@
   WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   bool display_test_result = false;
   ASSERT_TRUE(content::ExecuteScriptAndExtractBool(web_contents,
                                                    "DidDisplayReallyPass()",
                                                    &display_test_result));
   ASSERT_TRUE(display_test_result);
 }
 #endif  // !defined(DISABLE_NACL)
 
-#if defined(ENABLE_TASK_MANAGER)

[afakhry, 2016/04/28 00:03:13]

Why did we need an ifdef here while we didn't need one up there in the old
tests?

[ncarter (slow), 2016/05/02 18:33:27]

Good question, I can't figure this out. I gather this test doesn't compile on
OS_ANDROID?

Anyhow, I've added #if defined(ENABLE_TASK_MANAGER) to the other tests, since
you could set that in your gn config.

-
-namespace {
-
-base::string16 GetPrerenderTitlePrefix() {
-  return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_PRERENDER_PREFIX,
-                                    base::string16());
-}
-
-const std::vector<task_management::WebContentsTag*>& GetTrackedTags() {
-  return task_management::WebContentsTagsManager::GetInstance()->
-      tracked_tags();
-}
-
-// Tests the correct recording of tags for the prerender WebContents.
-IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, TaskManagementTagsBasic) {
-  // Browser tests start with a single tab.
-  EXPECT_EQ(1U, GetTrackedTags().size());
-
-  // Start prerendering a page and make sure it's correctly tagged.
-  PrerenderTestURL("/prerender/prerender_page.html", FINAL_STATUS_USED, 1);
-  EXPECT_EQ(2U, GetTrackedTags().size());
-
-  // Swap in the prerendered content and make sure its tag is removed.
-  NavigateToDestURL();
-  EXPECT_EQ(1U, GetTrackedTags().size());
-}
-
-// Tests that the task manager will be provided by tasks that correspond to
-// prerendered WebContents.
-IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, TaskManagementTasksProvided) {
-  task_management::MockWebContentsTaskManager task_manager;
-  // Browser tests start with a single tab.
-  EXPECT_EQ(1U, GetTrackedTags().size());
-
-  task_manager.StartObserving();
-
-  // The pre-existing tab is provided.
-  EXPECT_EQ(1U, task_manager.tasks().size());
-
-  // Start prerendering a page.
-  PrerenderTestURL("/prerender/prerender_page.html", FINAL_STATUS_USED, 1);
-
-  EXPECT_EQ(2U, GetTrackedTags().size());
-  ASSERT_EQ(2U, task_manager.tasks().size());
-
-  const task_management::Task* task = task_manager.tasks().back();
-  EXPECT_EQ(task_management::Task::RENDERER, task->GetType());
-  const base::string16 title = task->title();
-  const base::string16 expected_prefix = GetPrerenderTitlePrefix();
-  EXPECT_TRUE(base::StartsWith(title,
-                               expected_prefix,
-                               base::CompareCase::INSENSITIVE_ASCII));
-
-  NavigateToDestURL();
-  EXPECT_EQ(1U, task_manager.tasks().size());
-}
-
-}  // namespace
-
-#endif  // defined(ENABLE_TASK_MANAGER)
-
 }  // namespace prerender