summaryrefslogtreecommitdiffstats
path: root/chrome/browser/task_manager.h
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-04 08:05:10 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-04 08:05:10 +0000
commit7247f90b2f7b6b1ad4978a92b0f3b11e96c718f0 (patch)
treec06648be9d68a91ce0de697256a5fffed320d176 /chrome/browser/task_manager.h
parent5e9551419671f4d350d2101696dc9bf49257580c (diff)
downloadchromium_src-7247f90b2f7b6b1ad4978a92b0f3b11e96c718f0.zip
chromium_src-7247f90b2f7b6b1ad4978a92b0f3b11e96c718f0.tar.gz
chromium_src-7247f90b2f7b6b1ad4978a92b0f3b11e96c718f0.tar.bz2
This is also required.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17622 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager.h')
-rw-r--r--chrome/browser/task_manager.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/task_manager.h b/chrome/browser/task_manager.h
index c0eaa8b..1d2c311 100644
--- a/chrome/browser/task_manager.h
+++ b/chrome/browser/task_manager.h
@@ -121,8 +121,8 @@ class TaskManager {
void OnWindowClosed();
private:
- FRIEND_TEST(TaskManagerTest, Basic);
- FRIEND_TEST(TaskManagerTest, Resources);
+ FRIEND_TEST(TaskManagerTest, DISABLED_Basic);
+ FRIEND_TEST(TaskManagerTest, DISABLED_Resources);
// Obtain an instance via GetInstance().
TaskManager();