| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 telemetry import benchmark | 5 from telemetry import benchmark |
| 6 | 6 |
| 7 from measurements import power | 7 from measurements import power |
| 8 import page_sets | 8 import page_sets |
| 9 | 9 |
| 10 | 10 |
| 11 @benchmark.Disabled('android') # crbug.com/474696 | 11 @benchmark.Enabled('android') |
| 12 class PowerAndroidAcceptance(benchmark.Benchmark): | 12 class PowerAndroidAcceptance(benchmark.Benchmark): |
| 13 """Android power acceptance test.""" | 13 """Android power acceptance test.""" |
| 14 test = power.Power | 14 test = power.Power |
| 15 page_set = page_sets.AndroidAcceptancePageSet | 15 page_set = page_sets.AndroidAcceptancePageSet |
| 16 @classmethod | 16 @classmethod |
| 17 def Name(cls): | 17 def Name(cls): |
| 18 return 'power.android_acceptance' | 18 return 'power.android_acceptance' |
| 19 | 19 |
| 20 | 20 |
| 21 | 21 |
| 22 @benchmark.Disabled('android') # crbug.com/474696 | 22 @benchmark.Enabled('android') |
| 23 class PowerTypical10Mobile(benchmark.Benchmark): | 23 class PowerTypical10Mobile(benchmark.Benchmark): |
| 24 """Android typical 10 mobile power test.""" | 24 """Android typical 10 mobile power test.""" |
| 25 test = power.Power | 25 test = power.Power |
| 26 page_set = page_sets.Typical10MobilePageSet | 26 page_set = page_sets.Typical10MobilePageSet |
| 27 @classmethod | 27 @classmethod |
| 28 def Name(cls): | 28 def Name(cls): |
| 29 return 'power.typical_10_mobile' | 29 return 'power.typical_10_mobile' |
| 30 | 30 |
| 31 | 31 |
| OLD | NEW |