Task Manager: Preserve selection when rows are added

chrome/browser/ui/views/new_task_manager_view_browsertest.cc

Index: chrome/browser/ui/views/new_task_manager_view_browsertest.cc
diff --git a/chrome/browser/ui/views/new_task_manager_view_browsertest.cc b/chrome/browser/ui/views/new_task_manager_view_browsertest.cc
index e46dd0322eb444d8c99858d57c1b488f52f88c76..b1fc6eaf9a28548f6d4a9a7fef8f60bcf060b908 100644
--- a/chrome/browser/ui/views/new_task_manager_view_browsertest.cc
+++ b/chrome/browser/ui/views/new_task_manager_view_browsertest.cc
@@ -5,25 +5,45 @@
 #include <stddef.h>
 
 #include "base/macros.h"
+#include "base/strings/pattern.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/sessions/session_tab_helper.h"
+#include "chrome/browser/task_management/task_manager_browsertest_util.h"
+#include "chrome/browser/task_management/task_manager_tester.h"
+#include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_dialogs.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
+#include "chrome/browser/ui/tab_contents/tab_contents_iterator.h"
 #include "chrome/browser/ui/task_manager/task_manager_columns.h"
 #include "chrome/browser/ui/task_manager/task_manager_table_model.h"
 #include "chrome/browser/ui/views/new_task_manager_view.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
+#include "chrome/test/base/ui_test_utils.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/scoped_user_pref_update.h"
+#include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_contents_delegate.h"
+#include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
+#include "net/dns/mock_host_resolver.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 #include "ui/views/controls/table/table_view.h"
 
 namespace task_management {
 
+using browsertest_util::WaitForTaskManagerRows;
+
 class NewTaskManagerViewTest : public InProcessBrowserTest {
  public:
   NewTaskManagerViewTest() {}
   ~NewTaskManagerViewTest() override {}
 
+  void SetUpOnMainThread() override {
+    host_resolver()->AddRule("*", "127.0.0.1");
+    ASSERT_TRUE(embedded_test_server()->Start());
+  }
+
   void TearDownOnMainThread() override {
     // Make sure the task manager is closed (if any).
     chrome::HideTaskManager();
@@ -41,6 +61,8 @@ class NewTaskManagerViewTest : public InProcessBrowserTest {
     return GetView() ? GetView()->tab_table_ : nullptr;
   }
 
+  void PressKillButton() { GetView()->Accept(); }
+
   void ClearStoredColumnSettings() const {
     PrefService* local_state = g_browser_process->local_state();
     if (!local_state)
@@ -56,6 +78,27 @@ class NewTaskManagerViewTest : public InProcessBrowserTest {
     view->table_model_->ToggleColumnVisibility(col_id);
   }
 
+  // Looks up a tab based on its tab ID.
+  content::WebContents* FindWebContentsByTabId(SessionID::id_type tab_id) {
+    for (TabContentsIterator it; !it.done(); it.Next()) {
+      if (SessionTabHelper::IdForTab(*it) == tab_id)
+        return *it;
+    }
+    return nullptr;
+  }
+
+  // Returns the current TaskManagerTableModel index for a particular tab. Don't
+  // cache this value, since it can change whenever the message loop runs.
+  int FindRowForTab(content::WebContents* tab) {
+    int32_t tab_id = SessionTabHelper::IdForTab(tab);
+    auto tester = TaskManagerTester::Create(base::Closure());

[sky, 2016/05/19 19:08:47]

This may be obvious to you, but it's totally not obvious what the type of tester
is here. I recommend not using auto here.

[ncarter (slow), 2016/05/19 22:55:30]

Done.

+    for (int i = 0; i < tester->GetRowCount(); ++i) {
+      if (tester->GetTabId(i) == tab_id)
+        return i;
+    }
+    return -1;
+  }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(NewTaskManagerViewTest);
 };
@@ -146,5 +189,96 @@ IN_PROC_BROWSER_TEST_F(NewTaskManagerViewTest, ColumnsSettingsAreRestored) {
   }
 }
 
+IN_PROC_BROWSER_TEST_F(NewTaskManagerViewTest, SelectionConsistency) {
+  chrome::ShowTaskManager(browser());
+
+  // Set up a total of three tabs in different processes.
+  ui_test_utils::NavigateToURL(
+      browser(), embedded_test_server()->GetURL("a.com", "/title2.html"));
+  ui_test_utils::NavigateToURLWithDisposition(
+      browser(), embedded_test_server()->GetURL("b.com", "/title2.html"),
+      NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+  ui_test_utils::NavigateToURLWithDisposition(
+      browser(), embedded_test_server()->GetURL("c.com", "/title2.html"),
+      NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+
+  // Wait for their titles to appear in the TaskManager. There should be three
+  // rows.
+  auto pattern = browsertest_util::MatchTab("Title *");
+  int rows = 3;
+  ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(rows, pattern));
+
+  // Find the three tabs we set up, in TaskManager model order. Because we have
+  // not sorted the table yet, this should also be their UI display order.
+  auto tester = TaskManagerTester::Create(base::Closure());
+  std::vector<content::WebContents*> tabs;
+  for (int i = 0; i < tester->GetRowCount(); ++i) {
+    // Filter based on our title.
+    if (!base::MatchPattern(tester->GetRowTitle(i), pattern))
+      continue;
+    content::WebContents* tab = FindWebContentsByTabId(tester->GetTabId(i));
+    EXPECT_NE(nullptr, tab);
+    tabs.push_back(tab);
+  }
+  EXPECT_EQ(3U, tabs.size());
+
+  // Select the middle row, and store its tab id.
+  GetTable()->Select(FindRowForTab(tabs[1]));
+  EXPECT_EQ(GetTable()->FirstSelectedRow(), FindRowForTab(tabs[1]));
+
+  // Add 3 rows above the selection. The selected tab should not change.
+  for (int i = 0; i < 3; ++i) {
+    ASSERT_TRUE(content::ExecuteScript(tabs[0], "window.open('title3.html');"));
+    EXPECT_EQ(GetTable()->FirstSelectedRow(), FindRowForTab(tabs[1]));
+  }
+  ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows((rows += 3), pattern));
+  EXPECT_EQ(GetTable()->FirstSelectedRow(), FindRowForTab(tabs[1]));
+
+  // Add 2 rows below the selection. The selected tab should not change.
+  for (int i = 0; i < 2; ++i) {
+    ASSERT_TRUE(content::ExecuteScript(tabs[2], "window.open('title3.html');"));
+    EXPECT_EQ(GetTable()->FirstSelectedRow(), FindRowForTab(tabs[1]));
+  }
+  ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows((rows += 2), pattern));
+  EXPECT_EQ(GetTable()->FirstSelectedRow(), FindRowForTab(tabs[1]));
+
+  // Add a new row in the same process as the selection. The selected tab should
+  // not change.
+  ASSERT_TRUE(content::ExecuteScript(tabs[1], "window.open('title3.html');"));
+  EXPECT_EQ(GetTable()->FirstSelectedRow(), FindRowForTab(tabs[1]));
+  ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows((rows += 1), pattern));
+  EXPECT_EQ(GetTable()->FirstSelectedRow(), FindRowForTab(tabs[1]));
+  EXPECT_EQ(1, GetTable()->SelectedRowCount());
+
+  // Press the button, which kills the process of the selected row.
+  PressKillButton();
+
+  // Two rows should disappear.
+  ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows((rows -= 2), pattern));
+
+  // A later row should now be selected. The selection should be after the 4
+  // rows sharing the tabs[0] process, and it should be at or before
+  // the tabs[2] row.
+  ASSERT_LT(FindRowForTab(tabs[0]) + 3, GetTable()->FirstSelectedRow());
+  ASSERT_LE(GetTable()->FirstSelectedRow(), FindRowForTab(tabs[2]));
+
+  // Now select tabs[2].
+  GetTable()->Select(FindRowForTab(tabs[2]));
+
+  // Focus and reload one of the sad tabs. It should reappear in the TM. The
+  // other sad tab should not reappear.
+  tabs[1]->GetDelegate()->ActivateContents(tabs[1]);
+  chrome::Reload(browser(), CURRENT_TAB);
+  ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows((rows += 1), pattern));
+
+  // tabs[2] should still be selected.
+  EXPECT_EQ(GetTable()->FirstSelectedRow(), FindRowForTab(tabs[2]));
+
+  // Close tabs[0]. The selection should not change.
+  chrome::CloseWebContents(browser(), tabs[0], false);
+  ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows((rows -= 1), pattern));
+  EXPECT_EQ(GetTable()->FirstSelectedRow(), FindRowForTab(tabs[2]));
+}
+
 }  // namespace task_management