| Index: tools/perf/benchmarks/memory.py
|
| diff --git a/tools/perf/benchmarks/memory.py b/tools/perf/benchmarks/memory.py
|
| index 9d4a7401ec8ee414f2d7c91479c4876e3decef6f..90752a77d21ba85ad3b7d4db9801e17ff2f24767 100644
|
| --- a/tools/perf/benchmarks/memory.py
|
| +++ b/tools/perf/benchmarks/memory.py
|
| @@ -1,30 +1,30 @@
|
| # Copyright 2013 The Chromium Authors. All rights reserved.
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
| -from telemetry import test
|
| +from telemetry import benchmark
|
|
|
| from measurements import memory
|
| import page_sets
|
|
|
|
|
| -@test.Disabled('android') # crbug.com/370977
|
| -class MemoryMobile(test.Test):
|
| +@benchmark.Disabled('android') # crbug.com/370977
|
| +class MemoryMobile(benchmark.Benchmark):
|
| test = memory.Memory
|
| page_set = page_sets.MobileMemoryPageSet
|
|
|
|
|
| -class MemoryTop25(test.Test):
|
| +class MemoryTop25(benchmark.Benchmark):
|
| test = memory.Memory
|
| page_set = page_sets.Top25PageSet
|
|
|
|
|
| -class Reload2012Q3(test.Test):
|
| +class Reload2012Q3(benchmark.Benchmark):
|
| tag = 'reload'
|
| test = memory.Memory
|
| page_set = page_sets.Top2012Q3PageSet
|
|
|
|
|
| -@test.Disabled('android') # crbug.com/371153
|
| -class MemoryToughDomMemoryCases(test.Test):
|
| +@benchmark.Disabled('android') # crbug.com/371153
|
| +class MemoryToughDomMemoryCases(benchmark.Benchmark):
|
| test = memory.Memory
|
| page_set = page_sets.ToughDomMemoryCasesPageSet
|
|
|