Make old task manager tests work against new task manager.

chrome/browser/task_manager/task_manager_browsertest_util.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_BROWSERTEST_UTIL_H_
 #define CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_BROWSERTEST_UTIL_H_
 
 #include <stddef.h>
 
+#include <memory>
+
 #include "base/strings/string16.h"
 
+namespace content {
+class WebContents;
+}
+
 namespace task_manager {
 namespace browsertest_util {
 
-// For the old task manager browser tests, we must call this to disable the
-// use of the new implementation and revert back to the old one.
-void EnableOldTaskManager();
+// Specifies some integer-valued column of numeric data reported by the task
+// manager model. Please add more here as needed by tests.
+enum ColumnSpecifier {
+  V8_MEMORY,
+  V8_MEMORY_USED,
+  SQLITE_MEMORY_USED,
+
+  COLUMN_NONE,  // Default value.
+};
+
+// An adapter that abstracts away the difference of old vs. new task manager.
+class TaskManagerTesterInterface {
+ public:
+  virtual ~TaskManagerTesterInterface() {}
+
+  // Get the number of rows currently in the task manager.
+  virtual int GetRowCount() = 0;
+
+  // Get the title text of a particular |row|.
+  virtual base::string16 GetRowTitle(int row) = 0;
+
+  // Get the value of a column as an int64. Memory values are in bytes.
+  virtual int64_t GetColumnValue(ColumnSpecifier column, int row) = 0;
+
+  // If |row| is associated with a WebContents, return its SessionID. Otherwise,
+  // return -1.
+  virtual int32_t GetTabId(int row) = 0;
+
+  // Kill the process of |row|.
+  virtual void Kill(int row) = 0;
+};
+
+// Creates a TaskManagerTesterInterface backed by the current task manager.
+std::unique_ptr<TaskManagerTesterInterface> GetTaskManagerTester();
 
 // Runs the message loop, observing the task manager, until there are exactly
 // |resource_count| many resources whose titles match the pattern
 // |title_pattern|. The match is done via string_util's base::MatchPattern, so
 // |title_pattern| may contain wildcards like "*".
 //
 // If the wait times out, this test will trigger a gtest failure. To get
 // meaningful errors, tests should wrap invocations of this function with
 // ASSERT_NO_FATAL_FAILURE().
 void WaitForTaskManagerRows(int resource_count,
                             const base::string16& title_pattern);
 
-// Specifies some integer-valued column of numeric data reported by the task
-// manager model. Please add more here as needed by tests.
-enum ColumnSpecifier {
-  V8_MEMORY,
-  V8_MEMORY_USED,
-  SQLITE_MEMORY_USED,
-
-  COLUMN_NONE,  // Default value.
-};
-
 // Waits for the row identified by |title_pattern| to be showing a numeric data
 // value of at least |min_column_value| in the task manager column identified by
 // |column_specifier|. As with WaitForTaskManagerRows(), |title_pattern| is
 // meant to be a string returned by MatchTab() or similar.
 //
 // To get meaningful errors, tests should wrap invocations of this function with
 // ASSERT_NO_FATAL_FAILURE().
 void WaitForTaskManagerStatToExceed(const base::string16& title_pattern,
                                     ColumnSpecifier column_specifier,
                                     size_t min_column_value);
@@ skipping 15 matching lines @@
 base::string16 MatchSubframe(const char* title);    // "Subframe: " + title
 base::string16 MatchAnySubframe();                  // "Subframe: *"
 // "Utility: " + title
 base::string16 MatchUtility(const base::string16& title);
 base::string16 MatchAnyUtility();                   // "Utility: *"
 
 }  // namespace browsertest_util
 }  // namespace task_manager
 
 #endif  // CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_BROWSERTEST_UTIL_H_