OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/files/file_path.h" | 7 #include "base/files/file_path.h" |
8 #include "base/strings/stringprintf.h" | 8 #include "base/strings/stringprintf.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
(...skipping 760 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
771 DCHECK_NE(model()->GetResourceWebCoreImageCacheSize(resource_count), | 771 DCHECK_NE(model()->GetResourceWebCoreImageCacheSize(resource_count), |
772 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); | 772 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); |
773 DCHECK_NE(model()->GetResourceWebCoreScriptsCacheSize(resource_count), | 773 DCHECK_NE(model()->GetResourceWebCoreScriptsCacheSize(resource_count), |
774 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); | 774 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); |
775 DCHECK_NE(model()->GetResourceWebCoreCSSCacheSize(resource_count), | 775 DCHECK_NE(model()->GetResourceWebCoreCSSCacheSize(resource_count), |
776 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); | 776 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); |
777 } | 777 } |
778 | 778 |
779 // Checks that task manager counts a worker thread JS heap size. | 779 // Checks that task manager counts a worker thread JS heap size. |
780 // http://crbug.com/241066 | 780 // http://crbug.com/241066 |
781 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, WebWorkerJSHeapMemory) { | 781 // Disabled because this test is inherently flaky: http://crbug.com/259368 |
| 782 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, DISABLED_WebWorkerJSHeapMemory) { |
782 ShowTaskManager(); | 783 ShowTaskManager(); |
783 ui_test_utils::NavigateToURL(browser(), GetTestURL()); | 784 ui_test_utils::NavigateToURL(browser(), GetTestURL()); |
784 const int extra_timeout_ms = 500; | 785 const int extra_timeout_ms = 500; |
785 size_t minimal_heap_size = 2 * 1024 * 1024 * sizeof(void*); | 786 size_t minimal_heap_size = 2 * 1024 * 1024 * sizeof(void*); |
786 std::string test_js = base::StringPrintf( | 787 std::string test_js = base::StringPrintf( |
787 "var blob = new Blob([\n" | 788 "var blob = new Blob([\n" |
788 " 'mem = new Array(%lu);',\n" | 789 " 'mem = new Array(%lu);',\n" |
789 " 'for (var i = 0; i < mem.length; i += 16) mem[i] = i;',\n" | 790 " 'for (var i = 0; i < mem.length; i += 16) mem[i] = i;',\n" |
790 " 'postMessage(i);']);\n" | 791 " 'postMessage(i);']);\n" |
791 "blobURL = window.URL.createObjectURL(blob);\n" | 792 "blobURL = window.URL.createObjectURL(blob);\n" |
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1086 } else { | 1087 } else { |
1087 ASSERT_NO_FATAL_FAILURE( | 1088 ASSERT_NO_FATAL_FAILURE( |
1088 WaitForTaskManagerRows(0, MatchSubframe("http://b.com/"))); | 1089 WaitForTaskManagerRows(0, MatchSubframe("http://b.com/"))); |
1089 ASSERT_NO_FATAL_FAILURE( | 1090 ASSERT_NO_FATAL_FAILURE( |
1090 WaitForTaskManagerRows(1, MatchSubframe("http://c.com/"))); | 1091 WaitForTaskManagerRows(1, MatchSubframe("http://c.com/"))); |
1091 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnySubframe())); | 1092 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnySubframe())); |
1092 } | 1093 } |
1093 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("aac"))); | 1094 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("aac"))); |
1094 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); | 1095 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); |
1095 } | 1096 } |
OLD | NEW |