| 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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 case ColumnSpecifier::COLUMN_NONE: | 107 case ColumnSpecifier::COLUMN_NONE: |
| 108 return "N/A"; | 108 return "N/A"; |
| 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: |
| 118 return "Memory State"; |
| 117 } | 119 } |
| 118 return "N/A"; | 120 return "N/A"; |
| 119 } | 121 } |
| 120 | 122 |
| 121 void OnTimeout() { | 123 void OnTimeout() { |
| 122 base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, | 124 base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
| 123 run_loop_.QuitClosure()); | 125 run_loop_.QuitClosure()); |
| 124 FAIL() << "Timed out.\n" << DumpTaskManagerModel(); | 126 FAIL() << "Timed out.\n" << DumpTaskManagerModel(); |
| 125 } | 127 } |
| 126 | 128 |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 247 base::string16 MatchUtility(const base::string16& title) { | 249 base::string16 MatchUtility(const base::string16& title) { |
| 248 return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_UTILITY_PREFIX, title); | 250 return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_UTILITY_PREFIX, title); |
| 249 } | 251 } |
| 250 | 252 |
| 251 base::string16 MatchAnyUtility() { | 253 base::string16 MatchAnyUtility() { |
| 252 return MatchUtility(base::ASCIIToUTF16("*")); | 254 return MatchUtility(base::ASCIIToUTF16("*")); |
| 253 } | 255 } |
| 254 | 256 |
| 255 } // namespace browsertest_util | 257 } // namespace browsertest_util |
| 256 } // namespace task_manager | 258 } // namespace task_manager |
| OLD | NEW |