| 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 from telemetry import test | 4 from telemetry import test |
| 5 | 5 |
| 6 from measurements import memory | 6 from measurements import memory |
| 7 from page_sets import mobile_memory | 7 import page_sets |
| 8 from page_sets import top_25 | |
| 9 from page_sets import top_desktop_sites_2012Q3 | |
| 10 from page_sets import tough_dom_memory_cases | |
| 11 | 8 |
| 12 | 9 |
| 13 @test.Disabled('android') # crbug.com/370977 | 10 @test.Disabled('android') # crbug.com/370977 |
| 14 class MemoryMobile(test.Test): | 11 class MemoryMobile(test.Test): |
| 15 test = memory.Memory | 12 test = memory.Memory |
| 16 page_set = mobile_memory.MobileMemoryPageSet() | 13 page_set = page_sets.MobileMemoryPageSet |
| 17 | 14 |
| 18 | 15 |
| 19 class MemoryTop25(test.Test): | 16 class MemoryTop25(test.Test): |
| 20 test = memory.Memory | 17 test = memory.Memory |
| 21 page_set = top_25.Top25PageSet() | 18 page_set = page_sets.Top25PageSet |
| 22 | 19 |
| 23 | 20 |
| 24 class Reload2012Q3(test.Test): | 21 class Reload2012Q3(test.Test): |
| 25 tag = 'reload' | 22 tag = 'reload' |
| 26 test = memory.Memory | 23 test = memory.Memory |
| 27 page_set = top_desktop_sites_2012Q3.Top2012Q3PageSet() | 24 page_set = page_sets.Top2012Q3PageSet |
| 28 | 25 |
| 29 | 26 |
| 30 @test.Disabled('android') # crbug.com/371153 | 27 @test.Disabled('android') # crbug.com/371153 |
| 31 class MemoryToughDomMemoryCases(test.Test): | 28 class MemoryToughDomMemoryCases(test.Test): |
| 32 test = memory.Memory | 29 test = memory.Memory |
| 33 page_set = tough_dom_memory_cases.ToughDomMemoryCasesPageSet() | 30 page_set = page_sets.ToughDomMemoryCasesPageSet |
| OLD | NEW |