Index: tools/perf/benchmarks/tab_switching.py |
diff --git a/tools/perf/benchmarks/tab_switching.py b/tools/perf/benchmarks/tab_switching.py |
index 6962989cf54d46ac905afbc4b47f433169d80dff..e7e84ea0b4af39ba2ebcc4ade6ea9eab011e4f69 100644 |
--- a/tools/perf/benchmarks/tab_switching.py |
+++ b/tools/perf/benchmarks/tab_switching.py |
@@ -5,8 +5,8 @@ |
from core import perf_benchmark |
from measurements import tab_switching |
-import page_sets |
from telemetry import benchmark |
+import page_sets |
@benchmark.Enabled('has tabs') |
@@ -21,7 +21,10 @@ class TabSwitchingTop10(perf_benchmark.PerfBenchmark): |
metric. The pages were chosen from Alexa top ranking sites. |
""" |
test = tab_switching.TabSwitching |
- page_set = page_sets.Top10PageSet |
+ |
+ def CreateStorySet(self, options): |
+ return page_sets.SystemHealthStorySet(platform='desktop', |
+ case='multitab:top9') |
@classmethod |
def Name(cls): |
@@ -46,7 +49,8 @@ class TabSwitchingTypical25(perf_benchmark.PerfBenchmark): |
test = tab_switching.TabSwitching |
def CreateStorySet(self, options): |
- return page_sets.Typical25PageSet(run_no_page_interactions=True) |
+ return page_sets.SystemHealthStorySet(platform='desktop', |
+ case='multitab:typical24') |
@classmethod |
def Name(cls): |
@@ -69,9 +73,12 @@ class TabSwitchingFiveBlankTabs(perf_benchmark.PerfBenchmark): |
records the metric. Blank pages are use to detect unnecessary idle wakeups. |
""" |
test = tab_switching.TabSwitching |
- page_set = page_sets.FiveBlankPagesPageSet |
options = {'pageset_repeat': 10} |
+ def CreateStorySet(self, options): |
+ return page_sets.SystemHealthStorySet(platform='desktop', |
+ case='multitab:blanks') |
+ |
@classmethod |
def Name(cls): |
return 'tab_switching.five_blank_pages' |
@@ -94,9 +101,12 @@ class TabSwitchingToughEnergyCases(perf_benchmark.PerfBenchmark): |
records the metric. The pages were written by hand to stress energy usage. |
""" |
test = tab_switching.TabSwitching |
- page_set = page_sets.ToughEnergyCasesPageSet |
options = {'pageset_repeat': 10} |
+ def CreateStorySet(self, options): |
+ return page_sets.SystemHealthStorySet(platform='desktop', |
+ case='multitab:toughenergy') |
+ |
@classmethod |
def Name(cls): |
return 'tab_switching.tough_energy_cases' |
@@ -117,7 +127,10 @@ class TabSwitchingToughImageCases(perf_benchmark.PerfBenchmark): |
metric. The pages were chosen by hand to stress the image decoding system. |
""" |
test = tab_switching.TabSwitching |
- page_set = page_sets.ToughImageCasesPageSet |
+ |
+ def CreateStorySet(self, options): |
+ return page_sets.SystemHealthStorySet(platform='desktop', |
+ case='multitab:toughimage') |
@classmethod |
def Name(cls): |