OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_browsertest_util.h" | 5 #include "chrome/browser/task_manager/task_manager_browsertest_util.h" |
6 | 6 |
7 #include "base/bind_helpers.h" | 7 #include "base/bind_helpers.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/location.h" | 9 #include "base/location.h" |
10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
109 case ColumnSpecifier::V8_MEMORY: | 109 case ColumnSpecifier::V8_MEMORY: |
110 return "V8 Memory"; | 110 return "V8 Memory"; |
111 case ColumnSpecifier::V8_MEMORY_USED: | 111 case ColumnSpecifier::V8_MEMORY_USED: |
112 return "V8 Memory Used"; | 112 return "V8 Memory Used"; |
113 case ColumnSpecifier::SQLITE_MEMORY_USED: | 113 case ColumnSpecifier::SQLITE_MEMORY_USED: |
114 return "SQLite Memory Used"; | 114 return "SQLite Memory Used"; |
115 case ColumnSpecifier::IDLE_WAKEUPS: | 115 case ColumnSpecifier::IDLE_WAKEUPS: |
116 return "Idle wake ups"; | 116 return "Idle wake ups"; |
117 case ColumnSpecifier::MEMORY_STATE: | 117 case ColumnSpecifier::MEMORY_STATE: |
118 return "Memory State"; | 118 return "Memory State"; |
| 119 case ColumnSpecifier::NETWORK_USE: |
| 120 return "Network"; |
| 121 case ColumnSpecifier::TOTAL_NETWORK_USE: |
| 122 return "Total Network"; |
119 } | 123 } |
120 return "N/A"; | 124 return "N/A"; |
121 } | 125 } |
122 | 126 |
123 void OnTimeout() { | 127 void OnTimeout() { |
124 base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, | 128 base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
125 run_loop_.QuitClosure()); | 129 run_loop_.QuitClosure()); |
126 FAIL() << "Timed out.\n" << DumpTaskManagerModel(); | 130 FAIL() << "Timed out.\n" << DumpTaskManagerModel(); |
127 } | 131 } |
128 | 132 |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
249 base::string16 MatchUtility(const base::string16& title) { | 253 base::string16 MatchUtility(const base::string16& title) { |
250 return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_UTILITY_PREFIX, title); | 254 return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_UTILITY_PREFIX, title); |
251 } | 255 } |
252 | 256 |
253 base::string16 MatchAnyUtility() { | 257 base::string16 MatchAnyUtility() { |
254 return MatchUtility(base::ASCIIToUTF16("*")); | 258 return MatchUtility(base::ASCIIToUTF16("*")); |
255 } | 259 } |
256 | 260 |
257 } // namespace browsertest_util | 261 } // namespace browsertest_util |
258 } // namespace task_manager | 262 } // namespace task_manager |
OLD | NEW |