OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "base/file_path.h" | 7 #include "base/file_path.h" |
8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
9 #include "chrome/browser/background/background_contents_service.h" | 9 #include "chrome/browser/background/background_contents_service.h" |
10 #include "chrome/browser/background/background_contents_service_factory.h" | 10 #include "chrome/browser/background/background_contents_service_factory.h" |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 | 49 |
50 } // namespace | 50 } // namespace |
51 | 51 |
52 class TaskManagerBrowserTest : public ExtensionBrowserTest { | 52 class TaskManagerBrowserTest : public ExtensionBrowserTest { |
53 public: | 53 public: |
54 TaskManagerModel* model() const { | 54 TaskManagerModel* model() const { |
55 return TaskManager::GetInstance()->model(); | 55 return TaskManager::GetInstance()->model(); |
56 } | 56 } |
57 }; | 57 }; |
58 | 58 |
59 // Flaky on ChromeOS (triggers pure virtual function call), see | 59 // Flaky crashes on ChromeOS (triggers pure virtual function call), see |
60 // http://crbug.com/92297 for details | 60 // http://crbug.com/92297 for details |
61 #if defined(OS_CHROMEOS) | 61 #if defined(OS_CHROMEOS) |
62 #define MAYBE_ShutdownWhileOpen FLAKY_ShutdownWhileOpen | 62 #define MAYBE_ShutdownWhileOpen DISABLED_ShutdownWhileOpen |
63 #else | 63 #else |
64 #define MAYBE_ShutdownWhileOpen ShutdownWhileOpen | 64 #define MAYBE_ShutdownWhileOpen ShutdownWhileOpen |
65 #endif | 65 #endif |
66 | 66 |
67 // Regression test for http://crbug.com/13361 | 67 // Regression test for http://crbug.com/13361 |
68 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, MAYBE_ShutdownWhileOpen) { | 68 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, MAYBE_ShutdownWhileOpen) { |
69 browser()->window()->ShowTaskManager(); | 69 browser()->window()->ShowTaskManager(); |
70 } | 70 } |
71 | 71 |
72 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeTabContentsChanges) { | 72 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeTabContentsChanges) { |
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
442 TaskManagerBrowserTestUtil::WaitForResourceChange(3); | 442 TaskManagerBrowserTestUtil::WaitForResourceChange(3); |
443 | 443 |
444 // Check that we get some value for the cache columns. | 444 // Check that we get some value for the cache columns. |
445 DCHECK_NE(model()->GetResourceWebCoreImageCacheSize(2), | 445 DCHECK_NE(model()->GetResourceWebCoreImageCacheSize(2), |
446 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); | 446 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); |
447 DCHECK_NE(model()->GetResourceWebCoreScriptsCacheSize(2), | 447 DCHECK_NE(model()->GetResourceWebCoreScriptsCacheSize(2), |
448 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); | 448 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); |
449 DCHECK_NE(model()->GetResourceWebCoreCSSCacheSize(2), | 449 DCHECK_NE(model()->GetResourceWebCoreCSSCacheSize(2), |
450 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); | 450 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); |
451 } | 451 } |
OLD | NEW |