[Part 5 of 6] Move TaskManagerTester to the task_management directory.

chrome/browser/task_management/task_manager_tester.h

Index: chrome/browser/task_management/task_manager_tester.h
diff --git a/chrome/browser/task_manager/task_manager_browsertest_util.h b/chrome/browser/task_management/task_manager_tester.h
similarity index 22%
copy from chrome/browser/task_manager/task_manager_browsertest_util.h
copy to chrome/browser/task_management/task_manager_tester.h
index 2bf3a9dc4cc73dc718a39731ddb97fd5d503fe6a..def90e91e81ed6331e78098afc426a77513a0c37 100644
--- a/chrome/browser/task_manager/task_manager_browsertest_util.h
+++ b/chrome/browser/task_management/task_manager_tester.h
@@ -1,37 +1,31 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_BROWSERTEST_UTIL_H_
-#define CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_BROWSERTEST_UTIL_H_
+#ifndef CHROME_BROWSER_TASK_MANAGEMENT_TASK_MANAGER_TESTER_H_
+#define CHROME_BROWSER_TASK_MANAGEMENT_TASK_MANAGER_TESTER_H_
 
 #include <stddef.h>
 
 #include <memory>
 
+#include "base/callback_forward.h"
 #include "base/strings/string16.h"
+#include "chrome/browser/task_manager/task_manager_browsertest_util.h"
 
-namespace content {
-class WebContents;
-}
-
-// TODO(nick): Move everything here into the task_management namespace.
-namespace task_manager {
-namespace browsertest_util {
-
-// Specifies some integer-valued column of numeric data reported by the task
-// manager model. Please add more here as needed by tests.
-enum class ColumnSpecifier {
-  V8_MEMORY,
-  V8_MEMORY_USED,
-  SQLITE_MEMORY_USED,
-
-  COLUMN_NONE,  // Default value.
-};
+namespace task_management {
 
 // An adapter that abstracts away the difference of old vs. new task manager.
 class TaskManagerTester {
  public:
+  using ColumnSpecifier = task_manager::browsertest_util::ColumnSpecifier;
+
+  // Creates a TaskManagerTester backed by the current task manager. The task
+  // manager should already be visible when you call this function. |callback|,
+  // if not a null callback, will be invoked when the underlying model changes.
+  static std::unique_ptr<TaskManagerTester> Create(
+      const base::Closure& callback);
+
   virtual ~TaskManagerTester() {}
 
   // Get the number of rows currently in the task manager.
@@ -55,56 +49,6 @@ class TaskManagerTester {
   virtual void Kill(int row) = 0;
 };
 
-// Creates a TaskManagerTester backed by the current task manager. The task
-// manager should already be visible when you call this function.
-std::unique_ptr<TaskManagerTester> 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);
-
-// Make the indicated TaskManager column be visible.
-void ShowColumn(ColumnSpecifier column_specifier);
-
-// 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);
-
-// ASCII matcher convenience functions for use with WaitForTaskManagerRows()
-base::string16 MatchTab(const char* title);         // "Tab: " + title
-base::string16 MatchAnyTab();                       // "Tab: *"
-base::string16 MatchAboutBlankTab();                // "Tab: about:blank"
-base::string16 MatchExtension(const char* title);   // "Extension: " + title
-base::string16 MatchAnyExtension();                 // "Extension: *"
-base::string16 MatchApp(const char* title);         // "App: " + title
-base::string16 MatchAnyApp();                       // "App: *"
-base::string16 MatchWebView(const char* title);     // "WebView: " + title
-base::string16 MatchAnyWebView();                   // "WebView: *"
-base::string16 MatchBackground(const char* title);  // "Background: " + title
-base::string16 MatchAnyBackground();                // "Background: *"
-base::string16 MatchPrint(const char* title);       // "Print: " + title
-base::string16 MatchAnyPrint();                     // "Print: *"
-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_
+}  // namespace task_management
+
+#endif  // CHROME_BROWSER_TASK_MANAGEMENT_TASK_MANAGER_TESTER_H_