Task Manager: overhaul & re-enable task manager browser tests.

chrome/browser/task_manager/task_manager_browsertest_util.h

Index: chrome/browser/task_manager/task_manager_browsertest_util.h
diff --git a/chrome/browser/task_manager/task_manager_browsertest_util.h b/chrome/browser/task_manager/task_manager_browsertest_util.h
index 92c09da6defdd9bc4488d181e76d527a920b233a..dc2336dbce099b3b694256a9e4612d9756be1894 100644
--- a/chrome/browser/task_manager/task_manager_browsertest_util.h
+++ b/chrome/browser/task_manager/task_manager_browsertest_util.h
@@ -5,12 +5,23 @@
 #ifndef CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_BROWSERTEST_UTIL_H_
 #define CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_BROWSERTEST_UTIL_H_
 
-#include "chrome/browser/ui/browser.h"
+#include "base/strings/string16.h"
 
-class TaskManagerBrowserTestUtil {
- public:
-  static void WaitForWebResourceChange(int target_count);
+namespace task_manager {
+namespace browsertest_util {
 
-};
+// 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);
+
+}  // namespace browsertest_util
+}  // namespace task_manager
 
 #endif  // CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_BROWSERTEST_UTIL_H_