| 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 core import perf_benchmark | 5 from core import perf_benchmark |
| 6 | 6 |
| 7 from benchmarks import silk_flags | 7 from benchmarks import silk_flags |
| 8 from measurements import power | 8 from measurements import power |
| 9 import page_sets | 9 import page_sets |
| 10 from telemetry import benchmark | 10 from telemetry import benchmark |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 possible_browser.platform.GetDeviceTypeName() == 'Nexus 5X'): | 40 possible_browser.platform.GetDeviceTypeName() == 'Nexus 5X'): |
| 41 return True | 41 return True |
| 42 | 42 |
| 43 # crbug.com/671631 | 43 # crbug.com/671631 |
| 44 return possible_browser.platform.GetDeviceTypeName() == 'Nexus 9' | 44 return possible_browser.platform.GetDeviceTypeName() == 'Nexus 9' |
| 45 | 45 |
| 46 @classmethod | 46 @classmethod |
| 47 def Name(cls): | 47 def Name(cls): |
| 48 return 'power.typical_10_mobile' | 48 return 'power.typical_10_mobile' |
| 49 | 49 |
| 50 | 50 # This benchmark runs only on android but it is disabled on android as well |
| 51 @benchmark.Enabled('android') | 51 # because of http://crbug.com/683238 |
| 52 # @benchmark.Enabled('android') |
| 53 @benchmark.Disabled('all') |
| 52 @benchmark.Disabled('android-webview') # http://crbug.com/622300 | 54 @benchmark.Disabled('android-webview') # http://crbug.com/622300 |
| 53 class PowerToughAdCases(perf_benchmark.PerfBenchmark): | 55 class PowerToughAdCases(perf_benchmark.PerfBenchmark): |
| 54 """Android power test with tough ad pages.""" | 56 """Android power test with tough ad pages.""" |
| 55 test = power.Power | 57 test = power.Power |
| 56 page_set = page_sets.ToughAdCasesPageSet | 58 page_set = page_sets.ToughAdCasesPageSet |
| 57 | 59 |
| 58 def SetExtraBrowserOptions(self, options): | 60 def SetExtraBrowserOptions(self, options): |
| 59 options.full_performance_mode = False | 61 options.full_performance_mode = False |
| 60 | 62 |
| 61 @classmethod | 63 @classmethod |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 206 @benchmark.Enabled('mac') | 208 @benchmark.Enabled('mac') |
| 207 class PowerSteadyStatePages(perf_benchmark.PerfBenchmark): | 209 class PowerSteadyStatePages(perf_benchmark.PerfBenchmark): |
| 208 """Measure power consumption for real web sites in steady state (no user | 210 """Measure power consumption for real web sites in steady state (no user |
| 209 interactions).""" | 211 interactions).""" |
| 210 test = power.QuiescentPower | 212 test = power.QuiescentPower |
| 211 page_set = page_sets.IdleAfterLoadingStories | 213 page_set = page_sets.IdleAfterLoadingStories |
| 212 | 214 |
| 213 @classmethod | 215 @classmethod |
| 214 def Name(cls): | 216 def Name(cls): |
| 215 return 'power.steady_state' | 217 return 'power.steady_state' |
| OLD | NEW |