OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "base/file_path.h" | 8 #include "base/file_path.h" |
9 #include "chrome/browser/browser.h" | 9 #include "chrome/browser/browser.h" |
10 #include "chrome/browser/browser_window.h" | 10 #include "chrome/browser/browser_window.h" |
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
110 ASSERT_TRUE(first_tab); | 110 ASSERT_TRUE(first_tab); |
111 browser()->CloseTabContents(first_tab); | 111 browser()->CloseTabContents(first_tab); |
112 WaitForResourceChange(2); | 112 WaitForResourceChange(2); |
113 } | 113 } |
114 | 114 |
115 #if defined(OS_WIN) | 115 #if defined(OS_WIN) |
116 // http://crbug.com/31663 | 116 // http://crbug.com/31663 |
117 #define NoticeExtensionChanges DISABLED_NoticeExtensionChanges | 117 #define NoticeExtensionChanges DISABLED_NoticeExtensionChanges |
118 #endif | 118 #endif |
119 | 119 |
120 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeExtensionChanges) { | 120 // Flaky test bug filed in http://crbug.com/51701 |
| 121 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, FLAKY_NoticeExtensionChanges) { |
121 EXPECT_EQ(0, model()->ResourceCount()); | 122 EXPECT_EQ(0, model()->ResourceCount()); |
122 | 123 |
123 // Show the task manager. This populates the model, and helps with debugging | 124 // Show the task manager. This populates the model, and helps with debugging |
124 // (you see the task manager). | 125 // (you see the task manager). |
125 browser()->window()->ShowTaskManager(); | 126 browser()->window()->ShowTaskManager(); |
126 | 127 |
127 // Browser and the New Tab Page. | 128 // Browser and the New Tab Page. |
128 EXPECT_EQ(2, model()->ResourceCount()); | 129 EXPECT_EQ(2, model()->ResourceCount()); |
129 | 130 |
130 // Loading an extension should result in a new resource being | 131 // Loading an extension should result in a new resource being |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
255 WaitForResourceChange(3); | 256 WaitForResourceChange(3); |
256 | 257 |
257 // Check that we get some value for the cache columns. | 258 // Check that we get some value for the cache columns. |
258 DCHECK_NE(model()->GetResourceWebCoreImageCacheSize(2), | 259 DCHECK_NE(model()->GetResourceWebCoreImageCacheSize(2), |
259 l10n_util::GetString(IDS_TASK_MANAGER_NA_CELL_TEXT)); | 260 l10n_util::GetString(IDS_TASK_MANAGER_NA_CELL_TEXT)); |
260 DCHECK_NE(model()->GetResourceWebCoreScriptsCacheSize(2), | 261 DCHECK_NE(model()->GetResourceWebCoreScriptsCacheSize(2), |
261 l10n_util::GetString(IDS_TASK_MANAGER_NA_CELL_TEXT)); | 262 l10n_util::GetString(IDS_TASK_MANAGER_NA_CELL_TEXT)); |
262 DCHECK_NE(model()->GetResourceWebCoreCSSCacheSize(2), | 263 DCHECK_NE(model()->GetResourceWebCoreCSSCacheSize(2), |
263 l10n_util::GetString(IDS_TASK_MANAGER_NA_CELL_TEXT)); | 264 l10n_util::GetString(IDS_TASK_MANAGER_NA_CELL_TEXT)); |
264 } | 265 } |
OLD | NEW |