summaryrefslogtreecommitdiffstats
path: root/chrome/browser/task_manager/task_manager.h
diff options
context:
space:
mode:
authornick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-05 19:44:38 +0000
committernick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-05 19:44:38 +0000
commit5b931c81d15cf0b26cc52ba08ce47eb2727ec321 (patch)
tree4c6799682d33fec7db8b077e665a534f8845ac2a /chrome/browser/task_manager/task_manager.h
parent15dae1a7f1beb71b8167ab49d4c4fa51a776d87d (diff)
downloadchromium_src-5b931c81d15cf0b26cc52ba08ce47eb2727ec321.zip
chromium_src-5b931c81d15cf0b26cc52ba08ce47eb2727ec321.tar.gz
chromium_src-5b931c81d15cf0b26cc52ba08ce47eb2727ec321.tar.bz2
Task Manager: overhaul & re-enable task manager browser tests.
Fix some task manager bugs that showed up while working on these tests. Those bugs, in brief: - A couple of the resource managers didn't handle double-add properly, although it is possible for this to happen in practice if the task manager was opened after a tracked resource had been created, but before it was connected (for each of these bugs there is now a test that would fail without the fix). - On Windows (which has USE_ASH=1), panel resources were being double reported; they were tracked by both the Extension and the Panel resource provider. Eliminate a .gypi exclusion that caused the the taskmanager browser tests to not even be compiled on Aura platforms. Rewrite almost all tests to use a pattern of waiting for a row with a particular title to appear in the task manager model, rather than looking at indices. Substantially, the bread and butter of these tests are now expectations of the form: ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); This pattern allows these tests to be more resilent around the behavior of the GPU process, and hopefully will keep them from barfing the next time we introduce a new process type. For several of the tests, I've add new variants that show the task manager only AFTER the resources are created. This is done because the initial enumeration and the listening for new members are rather distinct codepaths. BUG=348836,331947,31663,163931,166322,66957,84719,84850,93158 Review URL: https://codereview.chromium.org/185873003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255118 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager/task_manager.h')
-rw-r--r--chrome/browser/task_manager/task_manager.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/task_manager/task_manager.h b/chrome/browser/task_manager/task_manager.h
index dd042fc..45a76d5 100644
--- a/chrome/browser/task_manager/task_manager.h
+++ b/chrome/browser/task_manager/task_manager.h
@@ -336,7 +336,7 @@ class TaskManagerModel : public base::RefCountedThreadSafe<TaskManagerModel> {
private:
friend class base::RefCountedThreadSafe<TaskManagerModel>;
- friend class TaskManagerNoShowBrowserTest;
+ friend class TaskManagerBrowserTest;
FRIEND_TEST_ALL_PREFIXES(ExtensionApiTest, ProcessesVsTaskManager);
FRIEND_TEST_ALL_PREFIXES(TaskManagerTest, RefreshCalled);
FRIEND_TEST_ALL_PREFIXES(TaskManagerWindowControllerTest,