| 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 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 211 extension = model()->GetResourceExtension(2); | 211 extension = model()->GetResourceExtension(2); |
| 212 | 212 |
| 213 ReloadExtension(extension->id()); | 213 ReloadExtension(extension->id()); |
| 214 WaitForResourceChange(3); | 214 WaitForResourceChange(3); |
| 215 extension = model()->GetResourceExtension(2); | 215 extension = model()->GetResourceExtension(2); |
| 216 | 216 |
| 217 ReloadExtension(extension->id()); | 217 ReloadExtension(extension->id()); |
| 218 WaitForResourceChange(3); | 218 WaitForResourceChange(3); |
| 219 } | 219 } |
| 220 | 220 |
| 221 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, PopulateWebCacheFields) { | 221 // Crashy, http://crbug.com/42301. |
| 222 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, |
| 223 DISABLED_PopulateWebCacheFields) { |
| 222 EXPECT_EQ(0, model()->ResourceCount()); | 224 EXPECT_EQ(0, model()->ResourceCount()); |
| 223 | 225 |
| 224 // Show the task manager. This populates the model, and helps with debugging | 226 // Show the task manager. This populates the model, and helps with debugging |
| 225 // (you see the task manager). | 227 // (you see the task manager). |
| 226 browser()->window()->ShowTaskManager(); | 228 browser()->window()->ShowTaskManager(); |
| 227 | 229 |
| 228 // Browser and the New Tab Page. | 230 // Browser and the New Tab Page. |
| 229 EXPECT_EQ(2, model()->ResourceCount()); | 231 EXPECT_EQ(2, model()->ResourceCount()); |
| 230 | 232 |
| 231 // Open a new tab and make sure we notice that. | 233 // Open a new tab and make sure we notice that. |
| 232 GURL url(ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory), | 234 GURL url(ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory), |
| 233 FilePath(kTitle1File))); | 235 FilePath(kTitle1File))); |
| 234 browser()->AddTabWithURL(url, GURL(), PageTransition::TYPED, | 236 browser()->AddTabWithURL(url, GURL(), PageTransition::TYPED, |
| 235 true, 0, false, NULL); | 237 true, 0, false, NULL); |
| 236 WaitForResourceChange(3); | 238 WaitForResourceChange(3); |
| 237 | 239 |
| 238 // Check that we get some value for the cache columns. | 240 // Check that we get some value for the cache columns. |
| 239 DCHECK_NE(model()->GetResourceWebCoreImageCacheSize(2), | 241 DCHECK_NE(model()->GetResourceWebCoreImageCacheSize(2), |
| 240 l10n_util::GetString(IDS_TASK_MANAGER_NA_CELL_TEXT)); | 242 l10n_util::GetString(IDS_TASK_MANAGER_NA_CELL_TEXT)); |
| 241 DCHECK_NE(model()->GetResourceWebCoreScriptsCacheSize(2), | 243 DCHECK_NE(model()->GetResourceWebCoreScriptsCacheSize(2), |
| 242 l10n_util::GetString(IDS_TASK_MANAGER_NA_CELL_TEXT)); | 244 l10n_util::GetString(IDS_TASK_MANAGER_NA_CELL_TEXT)); |
| 243 DCHECK_NE(model()->GetResourceWebCoreCSSCacheSize(2), | 245 DCHECK_NE(model()->GetResourceWebCoreCSSCacheSize(2), |
| 244 l10n_util::GetString(IDS_TASK_MANAGER_NA_CELL_TEXT)); | 246 l10n_util::GetString(IDS_TASK_MANAGER_NA_CELL_TEXT)); |
| 245 } | 247 } |
| OLD | NEW |