OLD | NEW |
1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 from measurements import memory | 5 from measurements import memory |
6 import page_sets | 6 import page_sets |
7 from telemetry import benchmark | 7 from telemetry import benchmark |
8 | 8 |
9 | 9 |
10 @benchmark.Enabled('android') | 10 @benchmark.Enabled('android') |
11 class MemoryMobile(benchmark.Benchmark): | 11 class MemoryMobile(benchmark.Benchmark): |
12 test = memory.Memory | 12 test = memory.Memory |
13 page_set = page_sets.MobileMemoryPageSet | 13 page_set = page_sets.MobileMemoryPageSet |
14 | 14 |
15 @classmethod | 15 @classmethod |
16 def Name(cls): | 16 def Name(cls): |
17 return 'memory.mobile_memory' | 17 return 'memory.mobile_memory' |
18 | 18 |
19 | 19 |
| 20 @benchmark.Disabled # http://crbug.com/459646 |
20 class MemoryTop7Stress(benchmark.Benchmark): | 21 class MemoryTop7Stress(benchmark.Benchmark): |
21 """Use (recorded) real world web sites and measure memory consumption.""" | 22 """Use (recorded) real world web sites and measure memory consumption.""" |
22 test = memory.Memory | 23 test = memory.Memory |
23 page_set = page_sets.Top7StressPageSet | 24 page_set = page_sets.Top7StressPageSet |
24 | 25 |
25 @classmethod | 26 @classmethod |
26 def Name(cls): | 27 def Name(cls): |
27 return 'memory.top_7_stress' | 28 return 'memory.top_7_stress' |
OLD | NEW |