Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(211)

Side by Side Diff: chrome/browser/task_manager/task_manager_browsertest_util.h

Issue 1293813005: Change the new-task-manager flag so that the new implementation is enabled by default for all users. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing old TM browser tests Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_BROWSERTEST_UTIL_H_ 5 #ifndef CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_BROWSERTEST_UTIL_H_
6 #define CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_BROWSERTEST_UTIL_H_ 6 #define CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_BROWSERTEST_UTIL_H_
7 7
8 #include "base/strings/string16.h" 8 #include "base/strings/string16.h"
9 9
10 namespace task_manager { 10 namespace task_manager {
11 namespace browsertest_util { 11 namespace browsertest_util {
12 12
13 // For the old task manager browser tests, they must call this to disable the
14 // use of the old implementation and revert back to the old one.
Lei Zhang 2015/08/14 22:44:24 the first "old" is suppose to be new, right?
afakhry 2015/08/14 23:04:40 Actually it's the second "old". Done.
Lei Zhang 2015/08/14 23:22:58 Eh? Surely you also meant the first one since that
afakhry 2015/08/14 23:25:51 There used to be three "old"s in the comment! :D I
15 void EnableOldTaskManager();
16
13 // Runs the message loop, observing the task manager, until there are exactly 17 // Runs the message loop, observing the task manager, until there are exactly
14 // |resource_count| many resources whose titles match the pattern 18 // |resource_count| many resources whose titles match the pattern
15 // |title_pattern|. The match is done via string_util's base::MatchPattern, so 19 // |title_pattern|. The match is done via string_util's base::MatchPattern, so
16 // |title_pattern| may contain wildcards like "*". 20 // |title_pattern| may contain wildcards like "*".
17 // 21 //
18 // If the wait times out, this test will trigger a gtest failure. To get 22 // If the wait times out, this test will trigger a gtest failure. To get
19 // meaningful errors, tests should wrap invocations of this function with 23 // meaningful errors, tests should wrap invocations of this function with
20 // ASSERT_NO_FATAL_FAILURE(). 24 // ASSERT_NO_FATAL_FAILURE().
21 void WaitForTaskManagerRows(int resource_count, 25 void WaitForTaskManagerRows(int resource_count,
22 const base::string16& title_pattern); 26 const base::string16& title_pattern);
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 base::string16 MatchSubframe(const char* title); // "Subframe: " + title 63 base::string16 MatchSubframe(const char* title); // "Subframe: " + title
60 base::string16 MatchAnySubframe(); // "Subframe: *" 64 base::string16 MatchAnySubframe(); // "Subframe: *"
61 // "Utility: " + title 65 // "Utility: " + title
62 base::string16 MatchUtility(const base::string16& title); 66 base::string16 MatchUtility(const base::string16& title);
63 base::string16 MatchAnyUtility(); // "Utility: *" 67 base::string16 MatchAnyUtility(); // "Utility: *"
64 68
65 } // namespace browsertest_util 69 } // namespace browsertest_util
66 } // namespace task_manager 70 } // namespace task_manager
67 71
68 #endif // CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_BROWSERTEST_UTIL_H_ 72 #endif // CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_BROWSERTEST_UTIL_H_
OLDNEW
« no previous file with comments | « chrome/browser/task_manager/task_manager_browsertest.cc ('k') | chrome/browser/task_manager/task_manager_browsertest_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698