[Telemetry] Add labels attribute to page as the new way to set label

BUG=418375

Review URL: https://codereview.chromium.org/686623002

Cr-Commit-Position: refs/heads/master@{#301552}

2 files changed, 21 insertions, 47 deletions

diff --git a/tools/perf/page_sets/key_mobile_sites.py b/tools/perf/page_sets/key_mobile_sites.py
index 2a90ef8..8d34f30 100644
--- a/tools/perf/page_sets/key_mobile_sites.py
+++ b/tools/perf/page_sets/key_mobile_sites.py
@@ -7,10 +7,10 @@ from telemetry.page import page_set as page_set_module
 
 class KeyMobileSitesPage(page_module.Page):
 
-  def __init__(self, url, page_set, name=''):
+  def __init__(self, url, page_set, name='', labels=None):
     super(KeyMobileSitesPage, self).__init__(
         url=url, page_set=page_set, name=name,
-        credentials_path='data/credentials.json')
+        credentials_path='data/credentials.json', labels=labels)
     self.user_agent_type = 'mobile'
     self.archive_data_file = 'data/key_mobile_sites.json'
 
@@ -30,10 +30,7 @@ class Page1(KeyMobileSitesPage):
 
   def __init__(self, page_set):
     super(Page1, self).__init__(
-      url='http://nytimes.com/',
-      page_set=page_set)
-
-    self.fastpath = True
+      url='http://nytimes.com/', page_set=page_set, labels=['fastpath'])
 
 
 class Page2(KeyMobileSitesPage):
@@ -59,10 +56,7 @@ class Page3(KeyMobileSitesPage):
 
   def __init__(self, page_set):
     super(Page3, self).__init__(
-      url='http://cuteoverload.com',
-      page_set=page_set)
-
-    self.fastpath = True
+      url='http://cuteoverload.com', page_set=page_set, labels=['fastpath'])
 
 
 class Page4(KeyMobileSitesPage):
@@ -288,9 +282,7 @@ class Page18(KeyMobileSitesPage):
   def __init__(self, page_set):
     super(Page18, self).__init__(
       url='http://slashdot.org/',
-      page_set=page_set)
-
-    self.fastpath = True
+      page_set=page_set, labels=['fastpath'])
 
 
 class Page19(KeyMobileSitesPage):
@@ -300,9 +292,7 @@ class Page19(KeyMobileSitesPage):
   def __init__(self, page_set):
     super(Page19, self).__init__(
       url='http://www.reddit.com/r/programming/comments/1g96ve',
-      page_set=page_set)
-
-    self.fastpath = True
+      page_set=page_set, labels=['fastpath'])
 
 
 class Page20(KeyMobileSitesPage):
@@ -311,10 +301,7 @@ class Page20(KeyMobileSitesPage):
 
   def __init__(self, page_set):
     super(Page20, self).__init__(
-      url='http://www.boingboing.net',
-      page_set=page_set)
-
-    self.fastpath = True
+      url='http://www.boingboing.net', page_set=page_set, labels=['fastpath'])
 
 
 class Page21(KeyMobileSitesPage):
diff --git a/tools/perf/page_sets/tough_video_cases.py b/tools/perf/page_sets/tough_video_cases.py
index f13f07c..094ebb0 100644
--- a/tools/perf/page_sets/tough_video_cases.py
+++ b/tools/perf/page_sets/tough_video_cases.py
@@ -7,8 +7,9 @@ from telemetry.page import page_set as page_set_module
 
 class ToughVideoCasesPage(page_module.Page):
 
-  def __init__(self, url, page_set):
-    super(ToughVideoCasesPage, self).__init__(url=url, page_set=page_set)
+  def __init__(self, url, page_set, labels=None):
+    super(ToughVideoCasesPage, self).__init__(
+        url=url, page_set=page_set, labels=labels)
 
   def LoopMixedAudio(self, action_runner):
     action_runner.PlayMedia(selector='#background_audio',
@@ -80,10 +81,9 @@ class Page4(ToughVideoCasesPage):
   def __init__(self, page_set):
     super(Page4, self).__init__(
       url='file://tough_video_cases/video.html?src=crowd1080.webm',
-      page_set=page_set)
+      page_set=page_set, labels=['is_50fps'])
 
     self.add_browser_metrics = True
-    self.is_50fps = True
 
   def RunPageInteractions(self, action_runner):
     self.PlayAction(action_runner)
@@ -94,11 +94,9 @@ class Page5(ToughVideoCasesPage):
   def __init__(self, page_set):
     super(Page5, self).__init__(
       url='file://tough_video_cases/video.html?src=crowd2160.ogv',
-      page_set=page_set)
+      page_set=page_set, labels=['is_4k', 'is_50fps'])
 
     self.add_browser_metrics = True
-    self.is_4k = True
-    self.is_50fps = True
 
   def RunPageInteractions(self, action_runner):
     self.PlayAction(action_runner)
@@ -109,11 +107,9 @@ class Page6(ToughVideoCasesPage):
   def __init__(self, page_set):
     super(Page6, self).__init__(
       url='file://tough_video_cases/video.html?src=crowd2160.webm',
-      page_set=page_set)
+      page_set=page_set, labels=['is_4k', 'is_50fps'])
 
     self.add_browser_metrics = True
-    self.is_4k = True
-    self.is_50fps = True
 
   def RunPageInteractions(self, action_runner):
     self.PlayAction(action_runner)
@@ -176,10 +172,9 @@ class Page11(ToughVideoCasesPage):
   def __init__(self, page_set):
     super(Page11, self).__init__(
       url='file://tough_video_cases/video.html?src=crowd1080.mp4',
-      page_set=page_set)
+      page_set=page_set, labels=['is_50fps'])
 
     self.add_browser_metrics = True
-    self.is_50fps = True
 
   def RunPageInteractions(self, action_runner):
     self.PlayAction(action_runner)
@@ -190,11 +185,9 @@ class Page12(ToughVideoCasesPage):
   def __init__(self, page_set):
     super(Page12, self).__init__(
       url='file://tough_video_cases/video.html?src=crowd2160.mp4',
-      page_set=page_set)
+      page_set=page_set, labels=['is_4k', 'is_50fps'])
 
     self.add_browser_metrics = True
-    self.is_4k = True
-    self.is_50fps = True
 
   def RunPageInteractions(self, action_runner):
     self.PlayAction(action_runner)
@@ -244,9 +237,8 @@ class Page16(ToughVideoCasesPage):
   def __init__(self, page_set):
     super(Page16, self).__init__(
       url='file://tough_video_cases/video.html?src=garden2_10s.webm',
-      page_set=page_set)
+      page_set=page_set, labels=['is_4k'])
 
-    self.is_4k = True
     self.add_browser_metrics = True
 
   def RunPageInteractions(self, action_runner):
@@ -258,9 +250,8 @@ class Page17(ToughVideoCasesPage):
   def __init__(self, page_set):
     super(Page17, self).__init__(
       url='file://tough_video_cases/video.html?src=garden2_10s.mp4',
-      page_set=page_set)
+      page_set=page_set, labels=['is_4k'])
 
-    self.is_4k = True
     self.add_browser_metrics = True
 
   def RunPageInteractions(self, action_runner):
@@ -272,9 +263,8 @@ class Page18(ToughVideoCasesPage):
   def __init__(self, page_set):
     super(Page18, self).__init__(
       url='file://tough_video_cases/video.html?src=garden2_10s.ogv',
-      page_set=page_set)
+      page_set=page_set, labels=['is_4k'])
 
-    self.is_4k = True
     self.add_browser_metrics = True
 
   def RunPageInteractions(self, action_runner):
@@ -364,10 +354,9 @@ class Page25(ToughVideoCasesPage):
   def __init__(self, page_set):
     super(Page25, self).__init__(
       url='file://tough_video_cases/video.html?src=garden2_10s.webm',
-      page_set=page_set)
+      page_set=page_set, labels=['is_4k'])
 
     self.skip_basic_metrics = True
-    self.is_4k = True
 
   def RunPageInteractions(self, action_runner):
     self.SeekBeforeAndAfterPlayhead(action_runner)
@@ -378,10 +367,9 @@ class Page26(ToughVideoCasesPage):
   def __init__(self, page_set):
     super(Page26, self).__init__(
       url='file://tough_video_cases/video.html?src=garden2_10s.mp4',
-      page_set=page_set)
+      page_set=page_set, labels=['is_4k'])
 
     self.skip_basic_metrics = True
-    self.is_4k = True
 
   def RunPageInteractions(self, action_runner):
     self.SeekBeforeAndAfterPlayhead(action_runner)
@@ -392,10 +380,9 @@ class Page27(ToughVideoCasesPage):
   def __init__(self, page_set):
     super(Page27, self).__init__(
       url='file://tough_video_cases/video.html?src=garden2_10s.ogv',
-      page_set=page_set)
+      page_set=page_set, labels=['is_4k'])
 
     self.skip_basic_metrics = True
-    self.is_4k = True
 
   def RunPageInteractions(self, action_runner):
     self.SeekBeforeAndAfterPlayhead(action_runner)