| 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/task_manager.h" | 5 #include "chrome/browser/task_manager/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 "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
| 10 #include "chrome/browser/background_contents_service.h" | 10 #include "chrome/browser/background_contents_service.h" |
| (...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 328 delegate->AsCrashedExtensionInfoBarDelegate(); | 328 delegate->AsCrashedExtensionInfoBarDelegate(); |
| 329 ASSERT_TRUE(crashed_delegate); | 329 ASSERT_TRUE(crashed_delegate); |
| 330 crashed_delegate->Accept(); | 330 crashed_delegate->Accept(); |
| 331 WaitForResourceChange(3); | 331 WaitForResourceChange(3); |
| 332 } | 332 } |
| 333 | 333 |
| 334 // Regression test for http://crbug.com/18693. | 334 // Regression test for http://crbug.com/18693. |
| 335 // | 335 // |
| 336 // This test has been crashy in the past, and is re-enabled temporarily to | 336 // This test has been crashy in the past, and is re-enabled temporarily to |
| 337 // gather more diagnostic information. See http://crbug.com/42315. | 337 // gather more diagnostic information. See http://crbug.com/42315. |
| 338 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, ReloadExtension) { | 338 // Crashy, http://crbug.com/66957. |
| 339 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, DISABLED_ReloadExtension) { |
| 339 // Show the task manager. This populates the model, and helps with debugging | 340 // Show the task manager. This populates the model, and helps with debugging |
| 340 // (you see the task manager). | 341 // (you see the task manager). |
| 341 browser()->window()->ShowTaskManager(); | 342 browser()->window()->ShowTaskManager(); |
| 342 | 343 |
| 343 LOG(INFO) << "loading extension"; | 344 LOG(INFO) << "loading extension"; |
| 344 ASSERT_TRUE(LoadExtension( | 345 ASSERT_TRUE(LoadExtension( |
| 345 test_data_dir_.AppendASCII("common").AppendASCII("background_page"))); | 346 test_data_dir_.AppendASCII("common").AppendASCII("background_page"))); |
| 346 | 347 |
| 347 // Wait until we see the loaded extension in the task manager (the three | 348 // Wait until we see the loaded extension in the task manager (the three |
| 348 // resources are: the browser process, New Tab Page, and the extension). | 349 // resources are: the browser process, New Tab Page, and the extension). |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 394 WaitForResourceChange(3); | 395 WaitForResourceChange(3); |
| 395 | 396 |
| 396 // Check that we get some value for the cache columns. | 397 // Check that we get some value for the cache columns. |
| 397 DCHECK_NE(model()->GetResourceWebCoreImageCacheSize(2), | 398 DCHECK_NE(model()->GetResourceWebCoreImageCacheSize(2), |
| 398 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); | 399 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); |
| 399 DCHECK_NE(model()->GetResourceWebCoreScriptsCacheSize(2), | 400 DCHECK_NE(model()->GetResourceWebCoreScriptsCacheSize(2), |
| 400 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); | 401 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); |
| 401 DCHECK_NE(model()->GetResourceWebCoreCSSCacheSize(2), | 402 DCHECK_NE(model()->GetResourceWebCoreCSSCacheSize(2), |
| 402 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); | 403 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); |
| 403 } | 404 } |
| OLD | NEW |