See the diff if we move task_manager_browsertest_util.cc to chrome/test

chrome/browser/task_manager/task_manager_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 "chrome/browser/task_manager/task_manager.h"
 
 #include <stddef.h>
 
 #include "base/files/file_path.h"
 #include "base/macros.h"
@@ skipping 44 matching lines @@
 using task_manager::browsertest_util::MatchAnyApp;
 using task_manager::browsertest_util::MatchAnyExtension;
 using task_manager::browsertest_util::MatchAnySubframe;
 using task_manager::browsertest_util::MatchAnyTab;
 using task_manager::browsertest_util::MatchAnyUtility;
 using task_manager::browsertest_util::MatchApp;
 using task_manager::browsertest_util::MatchExtension;
 using task_manager::browsertest_util::MatchSubframe;
 using task_manager::browsertest_util::MatchTab;
 using task_manager::browsertest_util::MatchUtility;
+using task_manager::browsertest_util::TaskManagerTester;
 using task_manager::browsertest_util::WaitForTaskManagerRows;
 using task_manager::browsertest_util::WaitForTaskManagerStatToExceed;
 
 namespace {
 
 const base::FilePath::CharType* kTitle1File = FILE_PATH_LITERAL("title1.html");
 
 }  // namespace
 
+// TODO(nick): Move this file into task_management. https://crbug.com/606963
 class TaskManagerBrowserTest : public ExtensionBrowserTest {
  public:
   TaskManagerBrowserTest() {}
   ~TaskManagerBrowserTest() override {}
 
-  TaskManagerModel* model() const {
-    return TaskManager::GetInstance()->model();
-  }
+  TaskManagerTester* model() { return model_.get(); }
 
   void ShowTaskManager() {
-    EXPECT_EQ(0, model()->ResourceCount());
-
     // Show the task manager. This populates the model, and helps with debugging
     // (you see the task manager).
     chrome::ShowTaskManager(browser());
+    model_ = task_manager::browsertest_util::GetTaskManagerTester();
   }
 
   void HideTaskManager() {
-    // Hide the task manager, and wait for the model to be depopulated.
+    model_.reset();
+
+    // Hide the task manager, and wait for it to go.
     chrome::HideTaskManager();
     base::RunLoop().RunUntilIdle();  // OnWindowClosed happens asynchronously.
-    EXPECT_EQ(0, model()->ResourceCount());
   }
 
   void Refresh() {
-    model()->Refresh();
-  }
-
-  int GetUpdateTimeMs() {
-    return TaskManagerModel::kUpdateTimeMs;
+    // Refresh() isn't ever needed on the new task manager.
+    if (switches::NewTaskManagerEnabled())
+      return;
+    TaskManager::GetInstance()->model()->Refresh();
   }
 
   GURL GetTestURL() {
     return ui_test_utils::GetTestUrl(
         base::FilePath(base::FilePath::kCurrentDirectory),
         base::FilePath(kTitle1File));
   }
 
   int FindResourceIndex(const base::string16& title) {
-    for (int i = 0; i < model()->ResourceCount(); ++i) {
-      if (title == model()->GetResourceTitle(i))
+    for (int i = 0; i < model_->GetRowCount(); ++i) {
+      if (title == model_->GetRowTitle(i))
         return i;
     }
     return -1;
   }
 
+  // TODO(nick, afakhry): Remove this function. https://crbug.com/606963
+  void DisableNewTaskManagerForBrokenTest() {
+    base::CommandLine::ForCurrentProcess()->AppendSwitch(
+        switches::kDisableNewTaskManager);
+  }
+
  protected:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     ExtensionBrowserTest::SetUpCommandLine(command_line);
 
-    // These tests are for the old implementation of the task manager. We must
-    // explicitly disable the new one.
-    task_manager::browsertest_util::EnableOldTaskManager();
-
     // Do not launch device discovery process.
     command_line->AppendSwitch(switches::kDisableDeviceDiscoveryNotifications);
   }
 
+  void TearDownOnMainThread() override { model_.reset(); }
+
  private:
+  std::unique_ptr<TaskManagerTester> model_;
   DISALLOW_COPY_AND_ASSIGN(TaskManagerBrowserTest);
 };
 
 class TaskManagerUtilityProcessBrowserTest : public TaskManagerBrowserTest {
  public:
   TaskManagerUtilityProcessBrowserTest() {}
 
  protected:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     TaskManagerBrowserTest::SetUpCommandLine(command_line);
@@ skipping 72 matching lines @@
 
   // Open a new tab and make sure the task manager notices it.
   AddTabAtIndex(0, GetTestURL(), ui::PAGE_TRANSITION_TYPED);
 
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("title1.html")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab()));
 
   // Killing the tab via task manager should remove the row.
   int tab = FindResourceIndex(MatchTab("title1.html"));
   ASSERT_NE(-1, tab);
-  ASSERT_TRUE(model()->GetResourceWebContents(tab) != NULL);
-  ASSERT_TRUE(model()->CanActivate(tab));
-  TaskManager::GetInstance()->KillProcess(tab);
+  ASSERT_NE(-1, model()->GetTabId(tab));
+  model()->Kill(tab);
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchTab("title1.html")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
 
   // Tab should reappear in task manager upon reload.
   chrome::Reload(browser(), CURRENT_TAB);
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("title1.html")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab()));
 }
 
-// Test for http://crbug.com/444945, which is not fixed yet.
-IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest,
-                       DISABLED_NavigateAwayFromHungRenderer) {
+// Regression test for http://crbug.com/444945.
+IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NavigateAwayFromHungRenderer) {
   host_resolver()->AddRule("*", "127.0.0.1");
   ASSERT_TRUE(embedded_test_server()->Start());
   ShowTaskManager();
 
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
 
   GURL url1(embedded_test_server()->GetURL("/title2.html"));
   GURL url3(embedded_test_server()->GetURL("a.com", "/iframe.html"));
 
   // Open a new tab and make sure the task manager notices it.
   AddTabAtIndex(0, url1, ui::PAGE_TRANSITION_TYPED);
   ASSERT_NO_FATAL_FAILURE(
       WaitForTaskManagerRows(1, MatchTab("Title Of Awesomeness")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab()));
   WebContents* tab1 = browser()->tab_strip_model()->GetActiveWebContents();
 
   // Initiate a navigation that will create a new WebContents in the same
-  // SiteInstace...
+  // SiteInstance. Then immediately hang the renderer so that title3.html can't
+  // load in this process.
   content::WebContentsAddedObserver web_contents_added_observer;
-  tab1->GetMainFrame()->ExecuteJavaScriptWithUserGestureForTests(
-      base::ASCIIToUTF16("window.open('title3.html', '_blank');"));
-  // ... then immediately hang the renderer so that title3.html can't load.
-  tab1->GetMainFrame()->ExecuteJavaScriptForTests(
-      base::ASCIIToUTF16("while(1);"));
+  int dummy_value = 0;
+  ASSERT_TRUE(content::ExecuteScriptAndExtractInt(
+      tab1->GetMainFrame(),
+      "window.open('title3.html', '_blank');\n"
+      "window.domAutomationController.send(55);\n"
+      "while(1);",
+      &dummy_value));
 
-  // Blocks until a new WebContents appears.
+  // Blocks until a new WebContents appears as a result of window.open().
   WebContents* tab2 = web_contents_added_observer.GetWebContents();
 
   // Make sure the new WebContents is in tab1's hung renderer process.
   ASSERT_NE(nullptr, tab2);
   ASSERT_NE(tab1, tab2);
   ASSERT_EQ(tab1->GetMainFrame()->GetProcess(),
             tab2->GetMainFrame()->GetProcess())
       << "New WebContents must be in the same process as the old WebContents, "
       << "so that the new tab doesn't finish loading (what this test is all "
       << "about)";
@@ skipping 138 matching lines @@
           "chrome-extension://behllobkkfkfnphdnhnkndlbkcpglgmj/"
           "french_sentence.html")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyExtension()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
 
   // Kill the process via the BACKGROUND PAGE (not the panel). Verify that both
   // the background page and the panel go away from the task manager.
   int background_page = FindResourceIndex(MatchExtension("My extension 1"));
   ASSERT_NE(-1, background_page);
-  ASSERT_TRUE(model()->GetResourceWebContents(background_page) == NULL);
-  ASSERT_FALSE(model()->CanActivate(background_page));
-  TaskManager::GetInstance()->KillProcess(background_page);
+  ASSERT_EQ(-1, model()->GetTabId(background_page));
+  model()->Kill(background_page);
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnyExtension()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
 }
 
 // Kills a process that has more than one task manager entry. This test is the
 // same as KillPanelViaExtensionResource except it does the kill via the other
 // entry.
 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, KillPanelViaPanelResource) {
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("good")
                                 .AppendASCII("Extensions")
@@ skipping 20 matching lines @@
       1,
       MatchExtension(
           "chrome-extension://behllobkkfkfnphdnhnkndlbkcpglgmj/"
           "french_sentence.html")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyExtension()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
 
   int background_page = FindResourceIndex(MatchExtension("My extension 1"));
   ASSERT_NE(-1, background_page);
-  ASSERT_TRUE(model()->GetResourceWebContents(background_page) == NULL);
-  ASSERT_FALSE(model()->CanActivate(background_page));
+  ASSERT_EQ(-1, model()->GetTabId(background_page));
 
   // Kill the process via the PANEL RESOURCE (not the background page). Verify
   // that both the background page and the panel go away from the task manager.
   int panel = FindResourceIndex(MatchExtension(
       "chrome-extension://behllobkkfkfnphdnhnkndlbkcpglgmj/"
       "french_sentence.html"));
   ASSERT_NE(-1, panel);
-  ASSERT_TRUE(model()->GetResourceWebContents(panel) != NULL);
-  ASSERT_TRUE(model()->CanActivate(panel));
-  TaskManager::GetInstance()->KillProcess(panel);
+  ASSERT_NE(-1, model()->GetTabId(panel));
+  model()->Kill(panel);
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnyExtension()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
 }
 
 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeExtensionTabChanges) {
   ShowTaskManager();
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
 
   ASSERT_TRUE(LoadExtension(
@@ skipping 15 matching lines @@
   AddTabAtIndex(0, url, ui::PAGE_TRANSITION_TYPED);
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchExtension("Foobar")));
   ASSERT_NO_FATAL_FAILURE(
       WaitForTaskManagerRows(1, MatchExtension("My extension 1")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyExtension()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
 
   int extension_tab = FindResourceIndex(MatchExtension("Foobar"));
   ASSERT_NE(-1, extension_tab);
-  ASSERT_TRUE(model()->GetResourceWebContents(extension_tab) != NULL);
-  ASSERT_TRUE(model()->CanActivate(extension_tab));
+  ASSERT_NE(-1, model()->GetTabId(extension_tab));
 
   int background_page = FindResourceIndex(MatchExtension("My extension 1"));
   ASSERT_NE(-1, background_page);
-  ASSERT_TRUE(model()->GetResourceWebContents(background_page) == NULL);
-  ASSERT_FALSE(model()->CanActivate(background_page));
+  ASSERT_EQ(-1, model()->GetTabId(background_page));
 }
 
 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeExtensionTab) {
   // With the task manager closed, open a new tab to an extension URL.
   // Afterwards, when we open the task manager, the third entry (background
   // page) should be an extension resource whose title starts with "Extension:".
   // The fourth entry (page.html) is also of type extension and has both a
   // WebContents and an extension. The title should start with "Extension:".
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("good")
                                 .AppendASCII("Extensions")
                                 .AppendASCII("behllobkkfkfnphdnhnkndlbkcpglgmj")
                                 .AppendASCII("1.0.0.0")));
   GURL url("chrome-extension://behllobkkfkfnphdnhnkndlbkcpglgmj/page.html");
   AddTabAtIndex(0, url, ui::PAGE_TRANSITION_TYPED);
 
   ShowTaskManager();
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchExtension("Foobar")));
   ASSERT_NO_FATAL_FAILURE(
       WaitForTaskManagerRows(1, MatchExtension("My extension 1")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyExtension()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
 
   int extension_tab = FindResourceIndex(MatchExtension("Foobar"));
   ASSERT_NE(-1, extension_tab);
-  ASSERT_TRUE(model()->GetResourceWebContents(extension_tab) != NULL);
-  ASSERT_TRUE(model()->CanActivate(extension_tab));
+  ASSERT_NE(-1, model()->GetTabId(extension_tab));
 
   int background_page = FindResourceIndex(MatchExtension("My extension 1"));
   ASSERT_NE(-1, background_page);
-  ASSERT_TRUE(model()->GetResourceWebContents(background_page) == NULL);
-  ASSERT_FALSE(model()->CanActivate(background_page));
+  ASSERT_EQ(-1, model()->GetTabId(background_page));
 }
 
 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeAppTabChanges) {
+  // TODO(nick, afakhry): Broken on new task manager because we show
+  // "Extension: Packaged App Test" instead of "App: Packaged App Test".
+  DisableNewTaskManagerForBrokenTest();
+
   ShowTaskManager();
 
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("packaged_app")));
   ExtensionService* service = extensions::ExtensionSystem::Get(
                                   browser()->profile())->extension_service();
   const extensions::Extension* extension =
       service->GetExtensionById(last_loaded_extension_id(), false);
 
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnyExtension()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnyApp()));
 
   // Open a new tab to the app's launch URL and make sure we notice that.
   GURL url(extension->GetResourceURL("main.html"));
   AddTabAtIndex(0, url, ui::PAGE_TRANSITION_TYPED);
 
   // There should be 1 "App: " tab and the original new tab page.
   ASSERT_NO_FATAL_FAILURE(
       WaitForTaskManagerRows(1, MatchApp("Packaged App Test")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyApp()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnyExtension()));
 
   // Check that the third entry (main.html) is of type extension and has both
   // a tab contents and an extension.
   int app_tab = FindResourceIndex(MatchApp("Packaged App Test"));
   ASSERT_NE(-1, app_tab);
-  ASSERT_TRUE(model()->GetResourceWebContents(app_tab) != NULL);
-  ASSERT_TRUE(model()->CanActivate(app_tab));
-  ASSERT_EQ(task_manager::Resource::EXTENSION,
-            model()->GetResourceType(app_tab));
+  ASSERT_NE(-1, model()->GetTabId(app_tab));
   ASSERT_EQ(2, browser()->tab_strip_model()->count());
 
   // Unload extension to make sure the tab goes away.
   UnloadExtension(last_loaded_extension_id());
 
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnyApp()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnyExtension()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab()));
   ASSERT_EQ(1, browser()->tab_strip_model()->count());
 }
 
 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeAppTab) {
+  // TODO(nick, afakhry): Broken on new task manager because we show
+  // "Extension: Packaged App Test" instead of "App: Packaged App Test".
+  DisableNewTaskManagerForBrokenTest();
+
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("packaged_app")));
   ExtensionService* service = extensions::ExtensionSystem::Get(
       browser()->profile())->extension_service();
   const extensions::Extension* extension =
       service->GetExtensionById(last_loaded_extension_id(), false);
 
   // Open a new tab to the app's launch URL and make sure we notice that.
   GURL url(extension->GetResourceURL("main.html"));
   AddTabAtIndex(0, url, ui::PAGE_TRANSITION_TYPED);
 
   ShowTaskManager();
 
   ASSERT_NO_FATAL_FAILURE(
       WaitForTaskManagerRows(1, MatchApp("Packaged App Test")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnyExtension()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyApp()));
 
   // Check that the third entry (main.html) is of type extension and has both
   // a tab contents and an extension.
   int app_tab = FindResourceIndex(MatchApp("Packaged App Test"));
   ASSERT_NE(-1, app_tab);
-  ASSERT_TRUE(model()->GetResourceWebContents(app_tab) != NULL);
-  ASSERT_TRUE(model()->CanActivate(app_tab));
-  ASSERT_EQ(task_manager::Resource::EXTENSION,
-            model()->GetResourceType(app_tab));
+  ASSERT_NE(-1, model()->GetTabId(app_tab));
 }
 
 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeHostedAppTabChanges) {
+  // TODO(nick, afakhry): Broken on new task manager because we show
+  // "Tab: Unmodified" instead of "App: ".
+  DisableNewTaskManagerForBrokenTest();
+
   ShowTaskManager();
 
   // The app under test acts on URLs whose host is "localhost",
   // so the URLs we navigate to must have host "localhost".
   host_resolver()->AddRule("*", "127.0.0.1");
   ASSERT_TRUE(embedded_test_server()->Start());
   GURL::Replacements replace_host;
   replace_host.SetHostStr("localhost");
   GURL base_url = embedded_test_server()->GetURL(
       "/extensions/api_test/app_process/");
@@ skipping 46 matching lines @@
 
   // No change expected.
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("Unmodified")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnyExtension()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnyApp()));
 }
 
 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeHostedAppTabAfterReload) {
+  // TODO(nick, afakhry): This fails on the new task manager (we never
+  // reclassify the tab as an app). Remove when fixed.
+  DisableNewTaskManagerForBrokenTest();
+
   // The app under test acts on URLs whose host is "localhost",
   // so the URLs we navigate to must have host "localhost".
   host_resolver()->AddRule("*", "127.0.0.1");
   ASSERT_TRUE(embedded_test_server()->Start());
   GURL::Replacements replace_host;
   replace_host.SetHostStr("localhost");
   GURL base_url =
       embedded_test_server()->GetURL("/extensions/api_test/app_process/");
   base_url = base_url.ReplaceComponents(replace_host);
 
@@ skipping 70 matching lines @@
   std::string extension_id = last_loaded_extension_id();
   for (int i = 1; i <= 5; i++) {
     SCOPED_TRACE(testing::Message() << "Reloading extension for the " << i
                                     << "th time.");
     ReloadExtension(extension_id);
     ASSERT_NO_FATAL_FAILURE(
         WaitForTaskManagerRows(1, MatchExtension("background_page")));
   }
 }
 
-// Crashy, http://crbug.com/42301.
-IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest,
-                       DISABLED_PopulateWebCacheFields) {
-  ShowTaskManager();
-  ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
-
-  int resource_count = TaskManager::GetInstance()->model()->ResourceCount();
-
-  // Open a new tab and make sure we notice that.
-  AddTabAtIndex(0, GetTestURL(), ui::PAGE_TRANSITION_TYPED);
-  ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab()));
-
-  // Check that we get some value for the cache columns.
-  DCHECK_NE(model()->GetResourceWebCoreImageCacheSize(resource_count),
-            l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT));
-  DCHECK_NE(model()->GetResourceWebCoreScriptsCacheSize(resource_count),
-            l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT));
-  DCHECK_NE(model()->GetResourceWebCoreCSSCacheSize(resource_count),
-            l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT));
-}
-
 // Checks that task manager counts a worker thread JS heap size.
 // http://crbug.com/241066
 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, WebWorkerJSHeapMemory) {
   ShowTaskManager();
+  model()->ToggleColumnVisibility(task_manager::browsertest_util::V8_MEMORY);
   ui_test_utils::NavigateToURL(browser(), GetTestURL());
   size_t minimal_heap_size = 4 * 1024 * 1024 * sizeof(void*);
   std::string test_js = base::StringPrintf(
       "var blob = new Blob([\n"
       "    'mem = new Array(%lu);',\n"
       "    'for (var i = 0; i < mem.length; i += 16)',"
       "    '  mem[i] = i;',\n"
       "    'postMessage(\"okay\");']);\n"
       "blobURL = window.URL.createObjectURL(blob);\n"
       "var worker = new Worker(blobURL);\n"
@@ skipping 28 matching lines @@
       "mem = new Array(%lu);\n"
       "for (var i = 0; i < mem.length; i += 16)\n"
       "  mem[i] = i;\n"
       "window.domAutomationController.send(\"okay\");\n",
       static_cast<unsigned long>(minimal_heap_size));
   std::string ok;
   ASSERT_TRUE(content::ExecuteScriptAndExtractString(
       browser()->tab_strip_model()->GetActiveWebContents(), test_js, &ok));
   ASSERT_EQ("okay", ok);
 
+  model()->ToggleColumnVisibility(task_manager::browsertest_util::V8_MEMORY);
+
   // The page's js has allocated objects of at least |minimal_heap_size| bytes.
   // Wait for the heap stats to reflect this.
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerStatToExceed(
       MatchTab("title1.html"), task_manager::browsertest_util::V8_MEMORY,
       minimal_heap_size));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerStatToExceed(
       MatchTab("title1.html"), task_manager::browsertest_util::V8_MEMORY_USED,
       minimal_heap_size));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("title1.html")));
 }
 
 // Checks that task manager counts utility process JS heap size.
 IN_PROC_BROWSER_TEST_F(TaskManagerUtilityProcessBrowserTest,
                        UtilityJSHeapMemory) {
   ShowTaskManager();
+  model()->ToggleColumnVisibility(task_manager::browsertest_util::V8_MEMORY);
+
+  auto proxy_resolver_name =
+      l10n_util::GetStringUTF16(IDS_UTILITY_PROCESS_PROXY_RESOLVER_NAME);
   ui_test_utils::NavigateToURL(browser(), GetTestURL());
   // The PAC script is trivial, so don't expect a large heap.
   size_t minimal_heap_size = 1024;
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerStatToExceed(
-      MatchUtility(
-          l10n_util::GetStringUTF16(IDS_UTILITY_PROCESS_PROXY_RESOLVER_NAME)),
-      task_manager::browsertest_util::V8_MEMORY,
-      minimal_heap_size));
+      MatchUtility(proxy_resolver_name),
+      task_manager::browsertest_util::V8_MEMORY, minimal_heap_size));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerStatToExceed(
-      MatchUtility(
-          l10n_util::GetStringUTF16(IDS_UTILITY_PROCESS_PROXY_RESOLVER_NAME)),
-      task_manager::browsertest_util::V8_MEMORY_USED,
-      minimal_heap_size));
+      MatchUtility(proxy_resolver_name),
+      task_manager::browsertest_util::V8_MEMORY_USED, minimal_heap_size));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyUtility()));
-  ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(
-      1, MatchUtility(l10n_util::GetStringUTF16(
-          IDS_UTILITY_PROCESS_PROXY_RESOLVER_NAME))));
+  ASSERT_NO_FATAL_FAILURE(
+      WaitForTaskManagerRows(1, MatchUtility(proxy_resolver_name)));
 }
 
 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, DevToolsNewDockedWindow) {
+  // TODO(nick, afakhry): Broken on new task manager because we show
+  // a long chrome-devtools:// URL without a prefix (expecting "Tab: *").
+  DisableNewTaskManagerForBrokenTest();
+
   ShowTaskManager();  // Task manager shown BEFORE dev tools window.
 
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
   DevToolsWindow* devtools =
       DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), true);
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab()));
   DevToolsWindowTesting::CloseDevToolsWindowSync(devtools);
 }
 
 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, DevToolsNewUndockedWindow) {
+  // TODO(nick, afakhry): Broken on new task manager because we show
+  // a long chrome-devtools:// URL without a prefix (expecting "Tab: *").
+  DisableNewTaskManagerForBrokenTest();
+
   ShowTaskManager();  // Task manager shown BEFORE dev tools window.
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
   DevToolsWindow* devtools =
       DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), false);
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(3, MatchAnyTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(3, MatchAnyTab()));
   DevToolsWindowTesting::CloseDevToolsWindowSync(devtools);
 }
 
 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, DevToolsOldDockedWindow) {
+  // TODO(nick, afakhry): Broken on new task manager because we show
+  // a long chrome-devtools:// URL without a prefix (expecting "Tab: *").
+  DisableNewTaskManagerForBrokenTest();
+
   DevToolsWindow* devtools =
       DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), true);
   ShowTaskManager();  // Task manager shown AFTER dev tools window.
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab()));
   DevToolsWindowTesting::CloseDevToolsWindowSync(devtools);
 }
 
-IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, DevToolsOldUnockedWindow) {
+IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, DevToolsOldUndockedWindow) {
+  // TODO(nick, afakhry): Broken on new task manager because we show
+  // a long chrome-devtools:// URL without a prefix (expecting "Tab: *").
+  DisableNewTaskManagerForBrokenTest();
+
   DevToolsWindow* devtools =
       DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), false);
   ShowTaskManager();  // Task manager shown AFTER dev tools window.
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(3, MatchAnyTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(3, MatchAnyTab()));
   DevToolsWindowTesting::CloseDevToolsWindowSync(devtools);
 }
 
 IN_PROC_BROWSER_TEST_P(TaskManagerOOPIFBrowserTest, KillSubframe) {
   ShowTaskManager();
@@ skipping 15 matching lines @@
   if (!ShouldExpectSubframes()) {
     ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe()));
   } else {
     ASSERT_NO_FATAL_FAILURE(
         WaitForTaskManagerRows(1, MatchSubframe("http://b.com/")));
     ASSERT_NO_FATAL_FAILURE(
         WaitForTaskManagerRows(1, MatchSubframe("http://c.com/")));
     ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnySubframe()));
     int subframe_b = FindResourceIndex(MatchSubframe("http://b.com/"));
     ASSERT_NE(-1, subframe_b);
-    ASSERT_TRUE(model()->GetResourceWebContents(subframe_b) != NULL);
-    ASSERT_TRUE(model()->CanActivate(subframe_b));
+    ASSERT_NE(-1, model()->GetTabId(subframe_b));
 
-    TaskManager::GetInstance()->KillProcess(subframe_b);
+    model()->Kill(subframe_b);
 
     ASSERT_NO_FATAL_FAILURE(
         WaitForTaskManagerRows(0, MatchSubframe("http://b.com/")));
     ASSERT_NO_FATAL_FAILURE(
         WaitForTaskManagerRows(1, MatchSubframe("http://c.com/")));
     ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnySubframe()));
     ASSERT_NO_FATAL_FAILURE(
         WaitForTaskManagerRows(1, MatchTab("cross-site iframe test")));
   }
 
   HideTaskManager();
   ShowTaskManager();
 
   if (!ShouldExpectSubframes()) {
     ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe()));
   } else {
     ASSERT_NO_FATAL_FAILURE(
         WaitForTaskManagerRows(0, MatchSubframe("http://b.com/")));
     ASSERT_NO_FATAL_FAILURE(
         WaitForTaskManagerRows(1, MatchSubframe("http://c.com/")));
     ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnySubframe()));
     ASSERT_NO_FATAL_FAILURE(
         WaitForTaskManagerRows(1, MatchTab("cross-site iframe test")));
   }
 }
 
 // Tests what happens when a tab navigates to a site (a.com) that it previously
 // has a cross-process subframe into (b.com).
-//
-// TODO(nick): http://crbug.com/442532. Disabled because the second navigation
-// hits an ASSERT(frame()) in WebLocalFrameImpl::loadRequest under --site-per-
-// process.
-IN_PROC_BROWSER_TEST_P(TaskManagerOOPIFBrowserTest,
-                       DISABLED_NavigateToSubframeProcess) {
+IN_PROC_BROWSER_TEST_P(TaskManagerOOPIFBrowserTest, NavigateToSubframeProcess) {
   ShowTaskManager();
 
   host_resolver()->AddRule("*", "127.0.0.1");
   ASSERT_TRUE(embedded_test_server()->Start());
   content::SetupCrossSiteRedirector(embedded_test_server());
 
   // Navigate the tab to a page on a.com with cross-process subframes to
   // b.com and c.com.
   GURL a_dotcom(embedded_test_server()->GetURL(
       "/cross-site/a.com/iframe_cross_site.html"));
@@ skipping 27 matching lines @@
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("iframe test")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe()));
   HideTaskManager();
   ShowTaskManager();
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("iframe test")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe()));
 }
 
-// TODO(nick): Fails flakily under OOPIF due to a ASSERT_NOT_REACHED in
-// WebRemoteFrame, at least under debug OSX. http://crbug.com/437956
 IN_PROC_BROWSER_TEST_P(TaskManagerOOPIFBrowserTest,
-                       DISABLED_NavigateToSiteWithSubframeToOriginalSite) {
+                       NavigateToSiteWithSubframeToOriginalSite) {
   ShowTaskManager();
 
   host_resolver()->AddRule("*", "127.0.0.1");
   ASSERT_TRUE(embedded_test_server()->Start());
   content::SetupCrossSiteRedirector(embedded_test_server());
 
   // Navigate to a page on b.com with a simple (same-site) iframe.
   // This should not show any subframe resources in the task manager.
   GURL b_dotcom(
       embedded_test_server()->GetURL("/cross-site/b.com/iframe.html"));
@@ skipping 102 matching lines @@
     ASSERT_NO_FATAL_FAILURE(
         WaitForTaskManagerRows(0, MatchSubframe("http://b.com/")));
     ASSERT_NO_FATAL_FAILURE(
         WaitForTaskManagerRows(1, MatchSubframe("http://c.com/")));
     ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnySubframe()));
   }
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("aac")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
 }
 
-// Tests what happens when a tab does a same-site navigation away from a page
-// with cross-site iframes.
-// Flaky on Windows. http://crbug.com/528282.
-#if defined(OS_WIN)
-#define MAYBE_LeavePageWithCrossSiteIframes DISABLED_LeavePageWithCrossSiteIframes
-#else
-#define MAYBE_LeavePageWithCrossSiteIframes LeavePageWithCrossSiteIframes
-#endif
 IN_PROC_BROWSER_TEST_P(TaskManagerOOPIFBrowserTest,
-                       MAYBE_LeavePageWithCrossSiteIframes) {
+                       LeavePageWithCrossSiteIframes) {
   ShowTaskManager();
 
   host_resolver()->AddRule("*", "127.0.0.1");
   ASSERT_TRUE(embedded_test_server()->Start());
   content::SetupCrossSiteRedirector(embedded_test_server());
 
   // Navigate the tab to a page on a.com with cross-process subframes.
   GURL a_dotcom_with_iframes(embedded_test_server()->GetURL(
       "/cross-site/a.com/iframe_cross_site.html"));
   browser()->OpenURL(content::OpenURLParams(a_dotcom_with_iframes,
@@ skipping 25 matching lines @@
       WaitForTaskManagerRows(1, MatchTab("Title Of Awesomeness")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe()));
 
   HideTaskManager();
   ShowTaskManager();
 
   ASSERT_NO_FATAL_FAILURE(
       WaitForTaskManagerRows(1, MatchTab("Title Of Awesomeness")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe()));
 }