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

Side by Side Diff: chrome/browser/task_manager_browsertest.cc

Issue 536007: Disable TaskManagerBrowserTest.NoticeExtensionChanges on XP until it is stabl... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 #include "chrome/browser/task_manager.h" 5 #include "chrome/browser/task_manager.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "chrome/browser/browser.h" 8 #include "chrome/browser/browser.h"
9 #include "chrome/browser/browser_window.h" 9 #include "chrome/browser/browser_window.h"
10 #include "chrome/browser/extensions/extension_browsertest.h" 10 #include "chrome/browser/extensions/extension_browsertest.h"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 true, 0, false, NULL); 90 true, 0, false, NULL);
91 WaitForResourceChange(3); 91 WaitForResourceChange(3);
92 92
93 // Close the tab and verify that we notice. 93 // Close the tab and verify that we notice.
94 TabContents* first_tab = browser()->GetTabContentsAt(0); 94 TabContents* first_tab = browser()->GetTabContentsAt(0);
95 ASSERT_TRUE(first_tab); 95 ASSERT_TRUE(first_tab);
96 browser()->CloseTabContents(first_tab); 96 browser()->CloseTabContents(first_tab);
97 WaitForResourceChange(2); 97 WaitForResourceChange(2);
98 } 98 }
99 99
100 #if defined(OS_WIN)
101 // http://crbug.com/31663
102 #define NoticeExtensionChanges DISABLED_NoticeExtensionChanges
103 #endif
104
100 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeExtensionChanges) { 105 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeExtensionChanges) {
101 EXPECT_EQ(0, model()->ResourceCount()); 106 EXPECT_EQ(0, model()->ResourceCount());
102 107
103 // Show the task manager. This populates the model, and helps with debugging 108 // Show the task manager. This populates the model, and helps with debugging
104 // (you see the task manager). 109 // (you see the task manager).
105 browser()->window()->ShowTaskManager(); 110 browser()->window()->ShowTaskManager();
106 111
107 // Browser and the New Tab Page. 112 // Browser and the New Tab Page.
108 EXPECT_EQ(2, model()->ResourceCount()); 113 EXPECT_EQ(2, model()->ResourceCount());
109 114
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 WaitForResourceChange(3); 195 WaitForResourceChange(3);
191 196
192 // Check that we get some value for the cache columns. 197 // Check that we get some value for the cache columns.
193 DCHECK_NE(model()->GetResourceWebCoreImageCacheSize(2), 198 DCHECK_NE(model()->GetResourceWebCoreImageCacheSize(2),
194 l10n_util::GetString(IDS_TASK_MANAGER_NA_CELL_TEXT)); 199 l10n_util::GetString(IDS_TASK_MANAGER_NA_CELL_TEXT));
195 DCHECK_NE(model()->GetResourceWebCoreScriptsCacheSize(2), 200 DCHECK_NE(model()->GetResourceWebCoreScriptsCacheSize(2),
196 l10n_util::GetString(IDS_TASK_MANAGER_NA_CELL_TEXT)); 201 l10n_util::GetString(IDS_TASK_MANAGER_NA_CELL_TEXT));
197 DCHECK_NE(model()->GetResourceWebCoreCSSCacheSize(2), 202 DCHECK_NE(model()->GetResourceWebCoreCSSCacheSize(2),
198 l10n_util::GetString(IDS_TASK_MANAGER_NA_CELL_TEXT)); 203 l10n_util::GetString(IDS_TASK_MANAGER_NA_CELL_TEXT));
199 } 204 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698