Make Task Manager sort more meaningful

chrome/browser/task_management/task_manager_browsertest.cc

 // Copyright 2016 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 <vector>
 
 #include "base/files/file_path.h"
 #include "base/macros.h"
+#include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/devtools/devtools_window_testing.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/notifications/notification.h"
@@ skipping 19 matching lines @@
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
+#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/page_transition_types.h"
 
 using content::WebContents;
 using task_management::browsertest_util::ColumnSpecifier;
 using task_management::browsertest_util::MatchAboutBlankTab;
 using task_management::browsertest_util::MatchAnyApp;
 using task_management::browsertest_util::MatchAnyExtension;
 using task_management::browsertest_util::MatchAnySubframe;
 using task_management::browsertest_util::MatchAnyTab;
 using task_management::browsertest_util::MatchAnyUtility;
 using task_management::browsertest_util::MatchApp;
 using task_management::browsertest_util::MatchExtension;
 using task_management::browsertest_util::MatchSubframe;
 using task_management::browsertest_util::MatchTab;
 using task_management::browsertest_util::MatchUtility;
 using task_management::browsertest_util::WaitForTaskManagerRows;
 using task_management::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 {}
 
   task_management::TaskManagerTester* model() { return model_.get(); }
 
   void ShowTaskManager() {
     // Show the task manager. This populates the model, and helps with debugging
     // (you see the task manager).
@@ skipping 30 matching lines @@
  protected:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     ExtensionBrowserTest::SetUpCommandLine(command_line);
 
     // Do not launch device discovery process.
     command_line->AppendSwitch(switches::kDisableDeviceDiscoveryNotifications);
   }
 
   void TearDownOnMainThread() override { model_.reset(); }
 
+  void SetUpOnMainThread() override {
+    host_resolver()->AddRule("*", "127.0.0.1");
+
+    // Add content/test/data so we can use cross_site_iframe_factory.html
+    base::FilePath test_data_dir;
+    ASSERT_TRUE(base::PathService::Get(base::DIR_SOURCE_ROOT, &test_data_dir));
+    embedded_test_server()->ServeFilesFromDirectory(
+        test_data_dir.AppendASCII("content/test/data/"));
+    ASSERT_TRUE(embedded_test_server()->Start());
+    content::SetupCrossSiteRedirector(embedded_test_server());
+  }
+
  private:
   std::unique_ptr<task_management::TaskManagerTester> model_;
   DISALLOW_COPY_AND_ASSIGN(TaskManagerBrowserTest);
 };
 
 class TaskManagerUtilityProcessBrowserTest : public TaskManagerBrowserTest {
  public:
   TaskManagerUtilityProcessBrowserTest() {}
 
  protected:
@@ skipping 87 matching lines @@
   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()));
 }
 
 // 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);
@@ skipping 391 matching lines @@
   int app_tab = FindResourceIndex(MatchApp("Packaged App Test"));
   ASSERT_NE(-1, app_tab);
   ASSERT_NE(-1, model()->GetTabId(app_tab));
 }
 
 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeHostedAppTabChanges) {
   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/");
   base_url = base_url.ReplaceComponents(replace_host);
 
   // Open a new tab to an app URL before the app is loaded.
   GURL url(base_url.Resolve("path1/empty.html"));
   content::WindowedNotificationObserver observer(
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
@@ skipping 33 matching lines @@
   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) {
   // 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);
+  GURL base_url = embedded_test_server()->GetURL(
+      "localhost", "/extensions/api_test/app_process/");
 
   // Open a new tab to an app URL before the app is loaded.
   GURL url(base_url.Resolve("path1/empty.html"));
   content::WindowedNotificationObserver observer(
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::NotificationService::AllSources());
   AddTabAtIndex(0, url, ui::PAGE_TRANSITION_TYPED);
   observer.Wait();
 
   // Load the hosted app and make sure it still starts with "Tab:",
   // since it hasn't changed to an app process yet.
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("api_test").AppendASCII("app_process")));
 
   // Now reload, which should transition this tab to being an App.
   ui_test_utils::NavigateToURL(browser(), url);
 
   ShowTaskManager();
 
   // The TaskManager should show this as an "App: "
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyApp()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnyExtension()));
 }
 
 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeHostedAppTabBeforeReload) {
   // 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);
+  GURL base_url = embedded_test_server()->GetURL(
+      "localhost", "/extensions/api_test/app_process/");
 
   // Open a new tab to an app URL before the app is loaded.
   GURL url(base_url.Resolve("path1/empty.html"));
   content::WindowedNotificationObserver observer(
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::NotificationService::AllSources());
   AddTabAtIndex(0, url, ui::PAGE_TRANSITION_TYPED);
   observer.Wait();
 
   // Load the hosted app and make sure it still starts with "Tab:",
@@ skipping 155 matching lines @@
       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();
 
-  host_resolver()->AddRule("*", "127.0.0.1");
-  ASSERT_TRUE(embedded_test_server()->Start());
-  content::SetupCrossSiteRedirector(embedded_test_server());
-
   GURL main_url(embedded_test_server()->GetURL(
       "/cross-site/a.com/iframe_cross_site.html"));
   browser()->OpenURL(content::OpenURLParams(main_url, content::Referrer(),
                                             CURRENT_TAB,
                                             ui::PAGE_TRANSITION_TYPED, false));
 
   ASSERT_NO_FATAL_FAILURE(
       WaitForTaskManagerRows(1, MatchTab("cross-site iframe test")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
 
@@ skipping 34 matching lines @@
     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).
 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"));
   browser()->OpenURL(content::OpenURLParams(a_dotcom, content::Referrer(),
                                             CURRENT_TAB,
                                             ui::PAGE_TRANSITION_TYPED, false));
 
   ASSERT_NO_FATAL_FAILURE(
       WaitForTaskManagerRows(1, MatchTab("cross-site iframe test")));
@@ skipping 25 matching lines @@
   ShowTaskManager();
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("iframe test")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe()));
 }
 
 IN_PROC_BROWSER_TEST_P(TaskManagerOOPIFBrowserTest,
                        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"));
 
   browser()->OpenURL(content::OpenURLParams(b_dotcom, content::Referrer(),
                                             CURRENT_TAB,
                                             ui::PAGE_TRANSITION_TYPED, false));
 
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("iframe test")));
@@ skipping 35 matching lines @@
     ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnySubframe()));
   }
 }
 
 // Tests what happens when a tab navigates a cross-frame iframe (to b.com)
 // back to the site of the parent document (a.com).
 IN_PROC_BROWSER_TEST_P(TaskManagerOOPIFBrowserTest,
                        CrossSiteIframeBecomesSameSite) {
   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"));
   browser()->OpenURL(content::OpenURLParams(a_dotcom, content::Referrer(),
                                             CURRENT_TAB,
                                             ui::PAGE_TRANSITION_TYPED, false));
 
   ASSERT_NO_FATAL_FAILURE(
       WaitForTaskManagerRows(1, MatchTab("cross-site iframe test")));
@@ skipping 41 matching lines @@
     ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnySubframe()));
   }
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("aac")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
 }
 
 IN_PROC_BROWSER_TEST_P(TaskManagerOOPIFBrowserTest,
                        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,
                                             content::Referrer(), CURRENT_TAB,
                                             ui::PAGE_TRANSITION_TYPED, false));
 
   ASSERT_NO_FATAL_FAILURE(
       WaitForTaskManagerRows(1, MatchTab("cross-site iframe test")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
@@ skipping 19 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()));
 }
+
+IN_PROC_BROWSER_TEST_P(TaskManagerOOPIFBrowserTest, OrderingOfDependentRows) {
+#if defined(OS_MACOSX)
+  // The ordering under test here is not implemented in the legacy task manager.
+  if (!task_management::TaskManagerInterface::IsNewTaskManagerEnabled())
+    return;
+#endif
+
+  ShowTaskManager();
+
+  GURL a_with_frames(embedded_test_server()->GetURL(
+      "a.com", "/cross_site_iframe_factory.html?a(b,b,c(d,a,b,c))"));
+  browser()->OpenURL(content::OpenURLParams(a_with_frames, content::Referrer(),
+                                            CURRENT_TAB,
+                                            ui::PAGE_TRANSITION_TYPED, false));
+
+  if (ShouldExpectSubframes()) {
+    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(1, MatchSubframe("http://d.com/")));
+    ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(3, MatchAnySubframe()));
+  }
+  ASSERT_NO_FATAL_FAILURE(
+      WaitForTaskManagerRows(1, MatchTab("Cross-site iframe factory")));
+
+  int index = FindResourceIndex(MatchTab("Cross-site iframe factory"));
+  std::vector<int> subframe_offsets;
+  if (ShouldExpectSubframes()) {
+    subframe_offsets = {
+        FindResourceIndex(MatchSubframe("http://b.com/")) - index,
+        FindResourceIndex(MatchSubframe("http://c.com/")) - index,
+        FindResourceIndex(MatchSubframe("http://d.com/")) - index};
+    EXPECT_THAT(subframe_offsets, testing::UnorderedElementsAre(1, 2, 3));
+  }
+
+  // Opening a new tab should appear below the existing tab.
+  GURL other_tab_url(embedded_test_server()->GetURL(
+      "d.com", "/cross_site_iframe_factory.html?d(a(c(b)))"));
+  browser()->OpenURL(content::OpenURLParams(other_tab_url, content::Referrer(),
+                                            NEW_FOREGROUND_TAB,
+                                            ui::PAGE_TRANSITION_TYPED, false));
+
+  ASSERT_NO_FATAL_FAILURE(
+      WaitForTaskManagerRows(2, MatchTab("Cross-site iframe factory")));
+  if (ShouldExpectSubframes()) {
+    ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(6, MatchAnySubframe()));
+    ASSERT_NO_FATAL_FAILURE(
+        WaitForTaskManagerRows(2, MatchSubframe("http://b.com/")));
+    ASSERT_NO_FATAL_FAILURE(
+        WaitForTaskManagerRows(2, MatchSubframe("http://c.com/")));
+    ASSERT_NO_FATAL_FAILURE(
+        WaitForTaskManagerRows(1, MatchSubframe("http://d.com/")));
+    ASSERT_NO_FATAL_FAILURE(
+        WaitForTaskManagerRows(1, MatchSubframe("http://a.com/")));
+    ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(6, MatchAnySubframe()));
+  } else {
+    ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe()));
+  }
+
+  // The first tab may have moved in absolute position in the list (due to
+  // random e.g. zygote or gpu activity).
+  index = FindResourceIndex(MatchTab("Cross-site iframe factory"));
+
+  // Tab 2's rows should immediately follow tab 1.
+  int tab2_start = index + static_cast<int>(subframe_offsets.size()) + 1;
+  int tab2_count = ShouldExpectSubframes() ? 4 : 1;
+  ASSERT_LE(tab2_start + tab2_count, model()->GetRowCount());
+
+  EXPECT_EQ("Tab: Cross-site iframe factory",
+            base::UTF16ToUTF8(model()->GetRowTitle(tab2_start)));
+  if (ShouldExpectSubframes()) {
+    // The relative ordering of tab1's subframe rows shall be the same as what
+    // was observed previously.
+    ASSERT_EQ(subframe_offsets[0],
+              FindResourceIndex(MatchSubframe("http://b.com/")) - index);
+    ASSERT_EQ(subframe_offsets[1],
+              FindResourceIndex(MatchSubframe("http://c.com/")) - index);
+    ASSERT_EQ(subframe_offsets[2],
+              FindResourceIndex(MatchSubframe("http://d.com/")) - index);
+
+    // Because the subframes for tab 2 are nested, their order is deterministic.
+    EXPECT_EQ("Subframe: http://a.com/",
+              base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 1)));
+    EXPECT_EQ("Subframe: http://c.com/",
+              base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 2)));
+    EXPECT_EQ("Subframe: http://b.com/",
+              base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 3)));
+  }
+}