Convert page sets in page_cycler/ to python

BUG=239179

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263177 0039d316-1c4b-4281-b951-d872f2087c98

25 files changed, 542 insertions, 315 deletions

diff --git a/tools/perf/benchmarks/page_cycler.py b/tools/perf/benchmarks/page_cycler.py
index b5801a1..01cacf2 100644
--- a/tools/perf/benchmarks/page_cycler.py
+++ b/tools/perf/benchmarks/page_cycler.py
@@ -8,13 +8,13 @@ from telemetry import test
 
 class PageCyclerBloat(test.Test):
   test = page_cycler.PageCycler
-  page_set = 'page_sets/page_cycler/bloat.json'
+  page_set = 'page_sets/page_cycler/bloat.py'
   options = {'pageset_repeat': 10}
 
 
 class PageCyclerDhtml(test.Test):
   test = page_cycler.PageCycler
-  page_set = 'page_sets/page_cycler/dhtml.json'
+  page_set = 'page_sets/page_cycler/dhtml.py'
   options = {'pageset_repeat': 10}
 
 
@@ -51,13 +51,13 @@ class PageCyclerIntlKoThVi(test.Test):
 
 class PageCyclerMorejs(test.Test):
   test = page_cycler.PageCycler
-  page_set = 'page_sets/page_cycler/morejs.json'
+  page_set = 'page_sets/page_cycler/morejs.py'
   options = {'pageset_repeat': 10}
 
 
 class PageCyclerMoz(test.Test):
   test = page_cycler.PageCycler
-  page_set = 'page_sets/page_cycler/moz.json'
+  page_set = 'page_sets/page_cycler/moz.py'
   options = {'pageset_repeat': 10}
 
 
diff --git a/tools/perf/page_sets/blank_page.py b/tools/perf/page_sets/blank_page.py
index 489f435..85ce5b1 100644
--- a/tools/perf/page_sets/blank_page.py
+++ b/tools/perf/page_sets/blank_page.py
@@ -1,17 +1,16 @@
 # Copyright 2014 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.page import page as page_module
+from telemetry.page import page_set as page_set_module
 
-from telemetry.page.page_set import PageSet
-from telemetry.page.page import PageWithDefaultRunNavigate
 
-
-class BlankPage(PageWithDefaultRunNavigate):
+class BlankPage(page_module.PageWithDefaultRunNavigate):
   def __init__(self, url, page_set):
     super(BlankPage, self).__init__(url, page_set=page_set)
 
 
-class BlankPageSet(PageSet):
+class BlankPageSet(page_set_module.PageSet):
   def __init__(self):
     super(BlankPageSet, self).__init__(description='A single blank page.')
     self.AddPage(BlankPage('file://blank_page/blank_page.html', self))
diff --git a/tools/perf/page_sets/page_cycler/__init__.py b/tools/perf/page_sets/page_cycler/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tools/perf/page_sets/page_cycler/__init__.py
diff --git a/tools/perf/page_sets/page_cycler/alexa_us.json b/tools/perf/page_sets/page_cycler/alexa_us.json
deleted file mode 100644
index bb92ea0..0000000
--- a/tools/perf/page_sets/page_cycler/alexa_us.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "description": "Alexa US page_cycler benchmark",
-    "serving_dirs": ["../../../../data/page_cycler/alexa_us"],
-    "pages": [
-        { "url": "file://../../../../data/page_cycler/alexa_us/accountservices.passport.net/" },
-        { "url": "file://../../../../data/page_cycler/alexa_us/sfbay.craigslist.org/" },
-        { "url": "file://../../../../data/page_cycler/alexa_us/www.amazon.com/" },
-        { "url": "file://../../../../data/page_cycler/alexa_us/www.aol.com/" },
-        { "url": "file://../../../../data/page_cycler/alexa_us/www.bbc.co.uk/" },
-        { "url": "file://../../../../data/page_cycler/alexa_us/www.blogger.com/" },
-        { "url": "file://../../../../data/page_cycler/alexa_us/www.cnn.com/" },
-        { "url": "file://../../../../data/page_cycler/alexa_us/www.ebay.com/" },
-        { "url": "file://../../../../data/page_cycler/alexa_us/www.flickr.com/" },
-        { "url": "file://../../../../data/page_cycler/alexa_us/www.friendster.com/" },
-        { "url": "file://../../../../data/page_cycler/alexa_us/www.go.com/" },
-        { "url": "file://../../../../data/page_cycler/alexa_us/www.google.com/" },
-        { "url": "file://../../../../data/page_cycler/alexa_us/www.imdb.com/" },
-        { "url": "file://../../../../data/page_cycler/alexa_us/www.megaupload.com/" },
-        { "url": "file://../../../../data/page_cycler/alexa_us/www.msn.com/" },
-        { "url": "file://../../../../data/page_cycler/alexa_us/www.myspace.com/" },
-        { "url": "file://../../../../data/page_cycler/alexa_us/www.orkut.com/" },
-        { "url": "file://../../../../data/page_cycler/alexa_us/www.wikipedia.org/" },
-        { "url": "file://../../../../data/page_cycler/alexa_us/www.xanga.com/" },
-        { "url": "file://../../../../data/page_cycler/alexa_us/www.youtube.com/" }
-    ]
-}
diff --git a/tools/perf/page_sets/page_cycler/alexa_us.py b/tools/perf/page_sets/page_cycler/alexa_us.py
new file mode 100644
index 0000000..889f12f
--- /dev/null
+++ b/tools/perf/page_sets/page_cycler/alexa_us.py
@@ -0,0 +1,50 @@
+# Copyright 2014 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.
+# pylint: disable=W0401,W0614
+from telemetry.page.actions.all_page_actions import *
+from telemetry.page import page as page_module
+from telemetry.page import page_set as page_set_module
+
+
+class AlexaUsPage(page_module.PageWithDefaultRunNavigate):
+
+  def __init__(self, url, page_set):
+    super(AlexaUsPage, self).__init__(url=url, page_set=page_set)
+
+
+class AlexaUsPageSet(page_set_module.PageSet):
+
+  """ Alexa US page_cycler benchmark  """
+
+  def __init__(self):
+    super(AlexaUsPageSet, self).__init__(
+      # pylint: disable=C0301
+      serving_dirs=set(['../../../../data/page_cycler/alexa_us']))
+
+    urls_list = [
+      # pylint: disable=C0301
+      'file://../../../../data/page_cycler/alexa_us/accountservices.passport.net/',
+      'file://../../../../data/page_cycler/alexa_us/sfbay.craigslist.org/',
+      'file://../../../../data/page_cycler/alexa_us/www.amazon.com/',
+      'file://../../../../data/page_cycler/alexa_us/www.aol.com/',
+      'file://../../../../data/page_cycler/alexa_us/www.bbc.co.uk/',
+      'file://../../../../data/page_cycler/alexa_us/www.blogger.com/',
+      'file://../../../../data/page_cycler/alexa_us/www.cnn.com/',
+      'file://../../../../data/page_cycler/alexa_us/www.ebay.com/',
+      'file://../../../../data/page_cycler/alexa_us/www.flickr.com/',
+      'file://../../../../data/page_cycler/alexa_us/www.friendster.com/',
+      'file://../../../../data/page_cycler/alexa_us/www.go.com/',
+      'file://../../../../data/page_cycler/alexa_us/www.google.com/',
+      'file://../../../../data/page_cycler/alexa_us/www.imdb.com/',
+      'file://../../../../data/page_cycler/alexa_us/www.megaupload.com/',
+      'file://../../../../data/page_cycler/alexa_us/www.msn.com/',
+      'file://../../../../data/page_cycler/alexa_us/www.myspace.com/',
+      'file://../../../../data/page_cycler/alexa_us/www.orkut.com/',
+      'file://../../../../data/page_cycler/alexa_us/www.wikipedia.org/',
+      'file://../../../../data/page_cycler/alexa_us/www.xanga.com/',
+      'file://../../../../data/page_cycler/alexa_us/www.youtube.com/'
+    ]
+
+    for url in urls_list:
+      self.AddPage(AlexaUsPage(url, self))
diff --git a/tools/perf/page_sets/page_cycler/bloat.json b/tools/perf/page_sets/page_cycler/bloat.json
deleted file mode 100644
index d19d67d..0000000
--- a/tools/perf/page_sets/page_cycler/bloat.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "description": "Bloat page_cycler benchmark",
-    "serving_dirs": ["../../../../data/page_cycler/bloat"],
-    "pages": [
-        { "url": "file://../../../../data/page_cycler/bloat/gmail_load_cleardot/" }
-    ]
-}
diff --git a/tools/perf/page_sets/page_cycler/bloat.py b/tools/perf/page_sets/page_cycler/bloat.py
new file mode 100644
index 0000000..0b53a0b
--- /dev/null
+++ b/tools/perf/page_sets/page_cycler/bloat.py
@@ -0,0 +1,27 @@
+# Copyright 2014 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.
+# pylint: disable=W0401,W0614
+from telemetry.page.actions.all_page_actions import *
+from telemetry.page import page as page_module
+from telemetry.page import page_set as page_set_module
+
+
+class BloatPage(page_module.PageWithDefaultRunNavigate):
+
+  def __init__(self, url, page_set):
+    super(BloatPage, self).__init__(url=url, page_set=page_set)
+
+
+class BloatPageSet(page_set_module.PageSet):
+
+  """ Bloat page_cycler benchmark """
+
+  def __init__(self):
+    super(BloatPageSet, self).__init__(
+      # pylint: disable=C0301
+      serving_dirs=set(['../../../../data/page_cycler/bloat']))
+
+    self.AddPage(BloatPage(
+      'file://../../../../data/page_cycler/bloat/gmail_load_cleardot/',
+      self))
diff --git a/tools/perf/page_sets/page_cycler/dhtml.json b/tools/perf/page_sets/page_cycler/dhtml.json
deleted file mode 100644
index 141c8dc..0000000
--- a/tools/perf/page_sets/page_cycler/dhtml.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "description": "DHTML page_cycler benchmark",
-    "serving_dirs": ["../../../../data/page_cycler/dhtml"],
-    "pages": [
-        { "url": "file://../../../../data/page_cycler/dhtml/colorfade/" },
-        { "url": "file://../../../../data/page_cycler/dhtml/diagball/" },
-        { "url": "file://../../../../data/page_cycler/dhtml/fadespacing/" },
-        { "url": "file://../../../../data/page_cycler/dhtml/imageslide/" },
-        { "url": "file://../../../../data/page_cycler/dhtml/layers1/" },
-        { "url": "file://../../../../data/page_cycler/dhtml/layers2/" },
-        { "url": "file://../../../../data/page_cycler/dhtml/layers4/" },
-        { "url": "file://../../../../data/page_cycler/dhtml/layers5/" },
-        { "url": "file://../../../../data/page_cycler/dhtml/layers6/" },
-        { "url": "file://../../../../data/page_cycler/dhtml/meter/" },
-        { "url": "file://../../../../data/page_cycler/dhtml/movingtext/" },
-        { "url": "file://../../../../data/page_cycler/dhtml/mozilla/" },
-        { "url": "file://../../../../data/page_cycler/dhtml/replaceimages/" },
-        { "url": "file://../../../../data/page_cycler/dhtml/scrolling/" },
-        { "url": "file://../../../../data/page_cycler/dhtml/slidein/" },
-        { "url": "file://../../../../data/page_cycler/dhtml/slidingballs/" },
-        { "url": "file://../../../../data/page_cycler/dhtml/zoom/" }
-    ]
-}
diff --git a/tools/perf/page_sets/page_cycler/dhtml.py b/tools/perf/page_sets/page_cycler/dhtml.py
new file mode 100644
index 0000000..a9103b7
--- /dev/null
+++ b/tools/perf/page_sets/page_cycler/dhtml.py
@@ -0,0 +1,46 @@
+# Copyright 2014 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.
+# pylint: disable=W0401,W0614
+from telemetry.page.actions.all_page_actions import *
+from telemetry.page import page as page_module
+from telemetry.page import page_set as page_set_module
+
+
+class DhtmlPage(page_module.PageWithDefaultRunNavigate):
+
+  def __init__(self, url, page_set):
+    super(DhtmlPage, self).__init__(url=url, page_set=page_set)
+
+
+class DhtmlPageSet(page_set_module.PageSet):
+
+  """ DHTML page_cycler benchmark """
+
+  def __init__(self):
+    super(DhtmlPageSet, self).__init__(
+      # pylint: disable=C0301
+      serving_dirs=set(['../../../../data/page_cycler/dhtml']))
+
+    urls_list = [
+      'file://../../../../data/page_cycler/dhtml/colorfade/',
+      'file://../../../../data/page_cycler/dhtml/diagball/',
+      'file://../../../../data/page_cycler/dhtml/fadespacing/',
+      'file://../../../../data/page_cycler/dhtml/imageslide/',
+      'file://../../../../data/page_cycler/dhtml/layers1/',
+      'file://../../../../data/page_cycler/dhtml/layers2/',
+      'file://../../../../data/page_cycler/dhtml/layers4/',
+      'file://../../../../data/page_cycler/dhtml/layers5/',
+      'file://../../../../data/page_cycler/dhtml/layers6/',
+      'file://../../../../data/page_cycler/dhtml/meter/',
+      'file://../../../../data/page_cycler/dhtml/movingtext/',
+      'file://../../../../data/page_cycler/dhtml/mozilla/',
+      'file://../../../../data/page_cycler/dhtml/replaceimages/',
+      'file://../../../../data/page_cycler/dhtml/scrolling/',
+      'file://../../../../data/page_cycler/dhtml/slidein/',
+      'file://../../../../data/page_cycler/dhtml/slidingballs/',
+      'file://../../../../data/page_cycler/dhtml/zoom/'
+    ]
+
+    for url in urls_list:
+      self.AddPage(DhtmlPage(url, self))
diff --git a/tools/perf/page_sets/page_cycler/dom.json b/tools/perf/page_sets/page_cycler/dom.json
deleted file mode 100644
index adacb71..0000000
--- a/tools/perf/page_sets/page_cycler/dom.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "description": "DOM page_cycler benchmark",
-    "serving_dirs": ["../../../../data/page_cycler/dom"],
-    "pages": [
-        { "url": "file://../../../../data/page_cycler/dom/HTMLDocument_write/" },
-        { "url": "file://../../../../data/page_cycler/dom/Document_getElementById/" },
-        { "url": "file://../../../../data/page_cycler/dom/DOMWindow_document/" },
-        { "url": "file://../../../../data/page_cycler/dom/DOMWindow_window/" },
-        { "url": "file://../../../../data/page_cycler/dom/Element_getAttribute/" },
-        { "url": "file://../../../../data/page_cycler/dom/HTMLCollection_length/" },
-        { "url": "file://../../../../data/page_cycler/dom/HTMLElement_className/" },
-        { "url": "file://../../../../data/page_cycler/dom/HTMLElement_id/" },
-        { "url": "file://../../../../data/page_cycler/dom/NodeList_length/" }
-    ]
-}
diff --git a/tools/perf/page_sets/page_cycler/dom.py b/tools/perf/page_sets/page_cycler/dom.py
new file mode 100644
index 0000000..62736a5
--- /dev/null
+++ b/tools/perf/page_sets/page_cycler/dom.py
@@ -0,0 +1,38 @@
+# Copyright 2014 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.
+# pylint: disable=W0401,W0614
+from telemetry.page.actions.all_page_actions import *
+from telemetry.page import page as page_module
+from telemetry.page import page_set as page_set_module
+
+
+class DomPage(page_module.PageWithDefaultRunNavigate):
+
+  def __init__(self, url, page_set):
+    super(DomPage, self).__init__(url=url, page_set=page_set)
+
+
+class DomPageSet(page_set_module.PageSet):
+
+  """ DOM page_cycler benchmark """
+
+  def __init__(self):
+    super(DomPageSet, self).__init__(
+      # pylint: disable=C0301
+      serving_dirs=set(['../../../../data/page_cycler/dom']))
+
+    urls_list = [
+      'file://../../../../data/page_cycler/dom/HTMLDocument_write/',
+      'file://../../../../data/page_cycler/dom/Document_getElementById/',
+      'file://../../../../data/page_cycler/dom/DOMWindow_document/',
+      'file://../../../../data/page_cycler/dom/DOMWindow_window/',
+      'file://../../../../data/page_cycler/dom/Element_getAttribute/',
+      'file://../../../../data/page_cycler/dom/HTMLCollection_length/',
+      'file://../../../../data/page_cycler/dom/HTMLElement_className/',
+      'file://../../../../data/page_cycler/dom/HTMLElement_id/',
+      'file://../../../../data/page_cycler/dom/NodeList_length/'
+    ]
+
+    for url in urls_list:
+      self.AddPage(DomPage(url, self))
diff --git a/tools/perf/page_sets/page_cycler/intl1.json b/tools/perf/page_sets/page_cycler/intl1.json
deleted file mode 100644
index 58f0247..0000000
--- a/tools/perf/page_sets/page_cycler/intl1.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-    "description": "Intl1 page_cycler benchmark",
-    "serving_dirs": ["../../../../data/page_cycler/intl1"],
-    "pages": [
-        { "url": "file://../../../../data/page_cycler/intl1/126.com/" },
-        { "url": "file://../../../../data/page_cycler/intl1/2ch.net/" },
-        { "url": "file://../../../../data/page_cycler/intl1/6park.com/" },
-        { "url": "file://../../../../data/page_cycler/intl1/affili.net/" },
-        { "url": "file://../../../../data/page_cycler/intl1/allegro.pl/" },
-        { "url": "file://../../../../data/page_cycler/intl1/apeha.ru/" },
-        { "url": "file://../../../../data/page_cycler/intl1/baidu.com/" },
-        { "url": "file://../../../../data/page_cycler/intl1/bbs.wefong.com/" },
-        { "url": "file://../../../../data/page_cycler/intl1/blog.skyrock.com/" },
-        { "url": "file://../../../../data/page_cycler/intl1/cmfu.com/" },
-        { "url": "file://../../../../data/page_cycler/intl1/cn.yahoo.com/" },
-        { "url": "file://../../../../data/page_cycler/intl1/contra.gr/" },
-        { "url": "file://../../../../data/page_cycler/intl1/dtiblog.com/" },
-        { "url": "file://../../../../data/page_cycler/intl1/el.wikipedia.org/" },
-        { "url": "file://../../../../data/page_cycler/intl1/elmundo.es/" },
-        { "url": "file://../../../../data/page_cycler/intl1/ettoday.com/" },
-        { "url": "file://../../../../data/page_cycler/intl1/exblog.jp/" },
-        { "url": "file://../../../../data/page_cycler/intl1/excite.co.jp/" },
-        { "url": "file://../../../../data/page_cycler/intl1/fc2.com/" },
-        { "url": "file://../../../../data/page_cycler/intl1/fora.pl/" },
-        { "url": "file://../../../../data/page_cycler/intl1/free.fr/" },
-        { "url": "file://../../../../data/page_cycler/intl1/golem.de/" },
-        { "url": "file://../../../../data/page_cycler/intl1/goo.ne.jp/" },
-        { "url": "file://../../../../data/page_cycler/intl1/haberturk.com/" },
-        { "url": "file://../../../../data/page_cycler/intl1/hatena.ne.jp/" },
-        { "url": "file://../../../../data/page_cycler/intl1/home.altervista.org/" },
-        { "url": "file://../../../../data/page_cycler/intl1/hurriyet.com.tr/" },
-        { "url": "file://../../../../data/page_cycler/intl1/jugem.jp/" },
-        { "url": "file://../../../../data/page_cycler/intl1/kakaku.com/" },
-        { "url": "file://../../../../data/page_cycler/intl1/mixi.jp/" },
-        { "url": "file://../../../../data/page_cycler/intl1/naftemporiki.gr/" },
-        { "url": "file://../../../../data/page_cycler/intl1/narod.yandex.ru/" },
-        { "url": "file://../../../../data/page_cycler/intl1/news.163.com/" },
-        { "url": "file://../../../../data/page_cycler/intl1/partyflock.nl/" },
-        { "url": "file://../../../../data/page_cycler/intl1/pchome.com.tw/" },
-        { "url": "file://../../../../data/page_cycler/intl1/phoenixtv.com/" },
-        { "url": "file://../../../../data/page_cycler/intl1/photofile.ru/" },
-        { "url": "file://../../../../data/page_cycler/intl1/pl.wikipedia.org/" },
-        { "url": "file://../../../../data/page_cycler/intl1/ricardo.ch/" },
-        { "url": "file://../../../../data/page_cycler/intl1/ru.wikipedia.org/" },
-        { "url": "file://../../../../data/page_cycler/intl1/ruten.com.tw/" },
-        { "url": "file://../../../../data/page_cycler/intl1/sport24.gr/" },
-        { "url": "file://../../../../data/page_cycler/intl1/terra.es/" },
-        { "url": "file://../../../../data/page_cycler/intl1/udn.com/" },
-        { "url": "file://../../../../data/page_cycler/intl1/uwants.com/" },
-        { "url": "file://../../../../data/page_cycler/intl1/voila.fr/" },
-        { "url": "file://../../../../data/page_cycler/intl1/www.alice.it/" },
-        { "url": "file://../../../../data/page_cycler/intl1/www.amazon.co.jp/" },
-        { "url": "file://../../../../data/page_cycler/intl1/www.auction.co.kr/" },
-        { "url": "file://../../../../data/page_cycler/intl1/www.chinaren.com/" },
-        { "url": "file://../../../../data/page_cycler/intl1/www.chosun.com/" },
-        { "url": "file://../../../../data/page_cycler/intl1/www.danawa.com/" },
-        { "url": "file://../../../../data/page_cycler/intl1/www.daum.net/" },
-        { "url": "file://../../../../data/page_cycler/intl1/www.dcinside.com/" },
-        { "url": "file://../../../../data/page_cycler/intl1/www.eastmoney.com/" },
-        { "url": "file://../../../../data/page_cycler/intl1/zol.com.cn/" }
-    ]
-}
diff --git a/tools/perf/page_sets/page_cycler/intl1.py b/tools/perf/page_sets/page_cycler/intl1.py
new file mode 100644
index 0000000..4cf9ef6
--- /dev/null
+++ b/tools/perf/page_sets/page_cycler/intl1.py
@@ -0,0 +1,84 @@
+# Copyright 2014 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.
+# pylint: disable=W0401,W0614
+from telemetry.page.actions.all_page_actions import *
+from telemetry.page import page as page_module
+from telemetry.page import page_set as page_set_module
+
+class Intl1Page(page_module.PageWithDefaultRunNavigate):
+
+  def __init__(self, url, page_set):
+    super(Intl1Page, self).__init__(url=url, page_set=page_set)
+
+
+class Intl1PageSet(page_set_module.PageSet):
+
+  """ Intl1 page_cycler benchmark """
+
+  def __init__(self):
+    super(Intl1PageSet, self).__init__(
+      # pylint: disable=C0301
+      serving_dirs=set(['../../../../data/page_cycler/intl1']))
+
+    urls_list = [
+      'file://../../../../data/page_cycler/intl1/126.com/',
+      'file://../../../../data/page_cycler/intl1/2ch.net/',
+      'file://../../../../data/page_cycler/intl1/6park.com/',
+      'file://../../../../data/page_cycler/intl1/affili.net/',
+      'file://../../../../data/page_cycler/intl1/allegro.pl/',
+      'file://../../../../data/page_cycler/intl1/apeha.ru/',
+      'file://../../../../data/page_cycler/intl1/baidu.com/',
+      'file://../../../../data/page_cycler/intl1/bbs.wefong.com/',
+      'file://../../../../data/page_cycler/intl1/blog.skyrock.com/',
+      'file://../../../../data/page_cycler/intl1/cmfu.com/',
+      'file://../../../../data/page_cycler/intl1/cn.yahoo.com/',
+      'file://../../../../data/page_cycler/intl1/contra.gr/',
+      'file://../../../../data/page_cycler/intl1/dtiblog.com/',
+      'file://../../../../data/page_cycler/intl1/el.wikipedia.org/',
+      'file://../../../../data/page_cycler/intl1/elmundo.es/',
+      'file://../../../../data/page_cycler/intl1/ettoday.com/',
+      'file://../../../../data/page_cycler/intl1/exblog.jp/',
+      'file://../../../../data/page_cycler/intl1/excite.co.jp/',
+      'file://../../../../data/page_cycler/intl1/fc2.com/',
+      'file://../../../../data/page_cycler/intl1/fora.pl/',
+      'file://../../../../data/page_cycler/intl1/free.fr/',
+      'file://../../../../data/page_cycler/intl1/golem.de/',
+      'file://../../../../data/page_cycler/intl1/goo.ne.jp/',
+      'file://../../../../data/page_cycler/intl1/haberturk.com/',
+      'file://../../../../data/page_cycler/intl1/hatena.ne.jp/',
+      'file://../../../../data/page_cycler/intl1/home.altervista.org/',
+      'file://../../../../data/page_cycler/intl1/hurriyet.com.tr/',
+      'file://../../../../data/page_cycler/intl1/jugem.jp/',
+      'file://../../../../data/page_cycler/intl1/kakaku.com/',
+      'file://../../../../data/page_cycler/intl1/mixi.jp/',
+      'file://../../../../data/page_cycler/intl1/naftemporiki.gr/',
+      'file://../../../../data/page_cycler/intl1/narod.yandex.ru/',
+      'file://../../../../data/page_cycler/intl1/news.163.com/',
+      'file://../../../../data/page_cycler/intl1/partyflock.nl/',
+      'file://../../../../data/page_cycler/intl1/pchome.com.tw/',
+      'file://../../../../data/page_cycler/intl1/phoenixtv.com/',
+      'file://../../../../data/page_cycler/intl1/photofile.ru/',
+      'file://../../../../data/page_cycler/intl1/pl.wikipedia.org/',
+      'file://../../../../data/page_cycler/intl1/ricardo.ch/',
+      'file://../../../../data/page_cycler/intl1/ru.wikipedia.org/',
+      'file://../../../../data/page_cycler/intl1/ruten.com.tw/',
+      'file://../../../../data/page_cycler/intl1/sport24.gr/',
+      'file://../../../../data/page_cycler/intl1/terra.es/',
+      'file://../../../../data/page_cycler/intl1/udn.com/',
+      'file://../../../../data/page_cycler/intl1/uwants.com/',
+      'file://../../../../data/page_cycler/intl1/voila.fr/',
+      'file://../../../../data/page_cycler/intl1/www.alice.it/',
+      'file://../../../../data/page_cycler/intl1/www.amazon.co.jp/',
+      'file://../../../../data/page_cycler/intl1/www.auction.co.kr/',
+      'file://../../../../data/page_cycler/intl1/www.chinaren.com/',
+      'file://../../../../data/page_cycler/intl1/www.chosun.com/',
+      'file://../../../../data/page_cycler/intl1/www.danawa.com/',
+      'file://../../../../data/page_cycler/intl1/www.daum.net/',
+      'file://../../../../data/page_cycler/intl1/www.dcinside.com/',
+      'file://../../../../data/page_cycler/intl1/www.eastmoney.com/',
+      'file://../../../../data/page_cycler/intl1/zol.com.cn/'
+    ]
+
+    for url in urls_list:
+      self.AddPage(Intl1Page(url, self))
diff --git a/tools/perf/page_sets/page_cycler/intl2.json b/tools/perf/page_sets/page_cycler/intl2.json
deleted file mode 100644
index 988f3f4..0000000
--- a/tools/perf/page_sets/page_cycler/intl2.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "description": "Intl2 page_cycler benchmark",
-    "serving_dirs": ["../../../../data/page_cycler/intl2"],
-    "pages": [
-        { "url": "file://../../../../data/page_cycler/intl2/arabicnews.google.com/" },
-        { "url": "file://../../../../data/page_cycler/intl2/bn.wikipedia.org/" },
-        { "url": "file://../../../../data/page_cycler/intl2/exteen.com/" },
-        { "url": "file://../../../../data/page_cycler/intl2/farsnews.com/" },
-        { "url": "file://../../../../data/page_cycler/intl2/hindi.webdunia.com/" },
-        { "url": "file://../../../../data/page_cycler/intl2/in.telugu.yahoo.com/" },
-        { "url": "file://../../../../data/page_cycler/intl2/isna.ir/" },
-        { "url": "file://../../../../data/page_cycler/intl2/kapook.com/" },
-        { "url": "file://../../../../data/page_cycler/intl2/kooora.com/" },
-        { "url": "file://../../../../data/page_cycler/intl2/manager.co.th/" },
-        { "url": "file://../../../../data/page_cycler/intl2/masrawy.com/" },
-        { "url": "file://../../../../data/page_cycler/intl2/ml.wikipedia.org/" },
-        { "url": "file://../../../../data/page_cycler/intl2/msn.co.il/" },
-        { "url": "file://../../../../data/page_cycler/intl2/news.bbc.co.uk/" },
-        { "url": "file://../../../../data/page_cycler/intl2/news.google.com/" },
-        { "url": "file://../../../../data/page_cycler/intl2/sh3bwah.com/" },
-        { "url": "file://../../../../data/page_cycler/intl2/sgkalesh.blogspot.com/" },
-        { "url": "file://../../../../data/page_cycler/intl2/tapuz.co.il/" },
-        { "url": "file://../../../../data/page_cycler/intl2/thaimisc.com/" },
-        { "url": "file://../../../../data/page_cycler/intl2/vietnamnet.vn/" },
-        { "url": "file://../../../../data/page_cycler/intl2/vnexpress.net/" },
-        { "url": "file://../../../../data/page_cycler/intl2/walla.co.il/" },
-        { "url": "file://../../../../data/page_cycler/intl2/www.aljayyash.net/" },
-        { "url": "file://../../../../data/page_cycler/intl2/www.bbc.co.uk/" },
-        { "url": "file://../../../../data/page_cycler/intl2/www.google.com.sa/" },
-        { "url": "file://../../../../data/page_cycler/intl2/www.islamweb.net/" },
-        { "url": "file://../../../../data/page_cycler/intl2/www.mthai.com/" },
-        { "url": "file://../../../../data/page_cycler/intl2/www.startimes2.com/" },
-        { "url": "file://../../../../data/page_cycler/intl2/www.jagran.com/" },
-        { "url": "file://../../../../data/page_cycler/intl2/ynet.co.il/" }
-    ]
-}
diff --git a/tools/perf/page_sets/page_cycler/intl2.py b/tools/perf/page_sets/page_cycler/intl2.py
new file mode 100644
index 0000000..c45d69f
--- /dev/null
+++ b/tools/perf/page_sets/page_cycler/intl2.py
@@ -0,0 +1,61 @@
+# Copyright 2014 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.
+# pylint: disable=W0401,W0614
+from telemetry.page.actions.all_page_actions import *
+from telemetry.page import page as page_module
+from telemetry.page import page_set as page_set_module
+
+class Intl2Page(page_module.PageWithDefaultRunNavigate):
+
+  def __init__(self, url, page_set):
+    super(Intl2Page, self).__init__(url=url, page_set=page_set)
+    # pylint: disable=C0301
+
+
+class Intl2PageSet(page_set_module.PageSet):
+
+  """
+  Description: Intl2 page_cycler benchmark
+  """
+
+  def __init__(self):
+    super(Intl2PageSet, self).__init__(
+      # pylint: disable=C0301
+      serving_dirs=set(['../../../../data/page_cycler/intl2']))
+
+    urls_list = [
+      'file://../../../../data/page_cycler/intl2/arabicnews.google.com/',
+      'file://../../../../data/page_cycler/intl2/bn.wikipedia.org/',
+      'file://../../../../data/page_cycler/intl2/exteen.com/',
+      'file://../../../../data/page_cycler/intl2/farsnews.com/',
+      'file://../../../../data/page_cycler/intl2/hindi.webdunia.com/',
+      'file://../../../../data/page_cycler/intl2/in.telugu.yahoo.com/',
+      'file://../../../../data/page_cycler/intl2/isna.ir/',
+      'file://../../../../data/page_cycler/intl2/kapook.com/',
+      'file://../../../../data/page_cycler/intl2/kooora.com/',
+      'file://../../../../data/page_cycler/intl2/manager.co.th/',
+      'file://../../../../data/page_cycler/intl2/masrawy.com/',
+      'file://../../../../data/page_cycler/intl2/ml.wikipedia.org/',
+      'file://../../../../data/page_cycler/intl2/msn.co.il/',
+      'file://../../../../data/page_cycler/intl2/news.bbc.co.uk/',
+      'file://../../../../data/page_cycler/intl2/news.google.com/',
+      'file://../../../../data/page_cycler/intl2/sh3bwah.com/',
+      'file://../../../../data/page_cycler/intl2/sgkalesh.blogspot.com/',
+      'file://../../../../data/page_cycler/intl2/tapuz.co.il/',
+      'file://../../../../data/page_cycler/intl2/thaimisc.com/',
+      'file://../../../../data/page_cycler/intl2/vietnamnet.vn/',
+      'file://../../../../data/page_cycler/intl2/vnexpress.net/',
+      'file://../../../../data/page_cycler/intl2/walla.co.il/',
+      'file://../../../../data/page_cycler/intl2/www.aljayyash.net/',
+      'file://../../../../data/page_cycler/intl2/www.bbc.co.uk/',
+      'file://../../../../data/page_cycler/intl2/www.google.com.sa/',
+      'file://../../../../data/page_cycler/intl2/www.islamweb.net/',
+      'file://../../../../data/page_cycler/intl2/www.mthai.com/',
+      'file://../../../../data/page_cycler/intl2/www.startimes2.com/',
+      'file://../../../../data/page_cycler/intl2/www.jagran.com/',
+      'file://../../../../data/page_cycler/intl2/ynet.co.il/'
+    ]
+
+    for url in urls_list:
+      self.AddPage(Intl2Page(url, self))
diff --git a/tools/perf/page_sets/page_cycler/morejs.json b/tools/perf/page_sets/page_cycler/morejs.json
deleted file mode 100644
index a9d27d1..0000000
--- a/tools/perf/page_sets/page_cycler/morejs.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "description": "More JS page_cycler benchmark",
-    "serving_dirs": ["../../../../data/page_cycler/morejs"],
-    "pages": [
-        { "url": "file://../../../../data/page_cycler/morejs/blog.chromium.org/" },
-        { "url": "file://../../../../data/page_cycler/morejs/dev.chromium.org/" },
-        { "url": "file://../../../../data/page_cycler/morejs/googleblog.blogspot.com1/" },
-        { "url": "file://../../../../data/page_cycler/morejs/googleblog.blogspot.com2/" },
-        { "url": "file://../../../../data/page_cycler/morejs/test.blogspot.com/" },
-        { "url": "file://../../../../data/page_cycler/morejs/www.igoogle.com/" },
-        { "url": "file://../../../../data/page_cycler/morejs/www.techcrunch.com/" },
-        { "url": "file://../../../../data/page_cycler/morejs/www.webkit.org/" },
-        { "url": "file://../../../../data/page_cycler/morejs/www.yahoo.com/" }
-    ]
-}
diff --git a/tools/perf/page_sets/page_cycler/morejs.py b/tools/perf/page_sets/page_cycler/morejs.py
new file mode 100644
index 0000000..ce57cbc
--- /dev/null
+++ b/tools/perf/page_sets/page_cycler/morejs.py
@@ -0,0 +1,37 @@
+# Copyright 2014 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.
+# pylint: disable=W0401,W0614
+from telemetry.page.actions.all_page_actions import *
+from telemetry.page import page as page_module
+from telemetry.page import page_set as page_set_module
+
+class MorejsPage(page_module.PageWithDefaultRunNavigate):
+
+  def __init__(self, url, page_set):
+    super(MorejsPage, self).__init__(url=url, page_set=page_set)
+
+
+class MorejsPageSet(page_set_module.PageSet):
+
+  """ More JS page_cycler benchmark """
+
+  def __init__(self):
+    super(MorejsPageSet, self).__init__(
+      # pylint: disable=C0301
+      serving_dirs=set(['../../../../data/page_cycler/morejs']))
+
+    urls_list = [
+      'file://../../../../data/page_cycler/morejs/blog.chromium.org/',
+      'file://../../../../data/page_cycler/morejs/dev.chromium.org/',
+      'file://../../../../data/page_cycler/morejs/googleblog.blogspot.com1/',
+      'file://../../../../data/page_cycler/morejs/googleblog.blogspot.com2/',
+      'file://../../../../data/page_cycler/morejs/test.blogspot.com/',
+      'file://../../../../data/page_cycler/morejs/www.igoogle.com/',
+      'file://../../../../data/page_cycler/morejs/www.techcrunch.com/',
+      'file://../../../../data/page_cycler/morejs/www.webkit.org/',
+      'file://../../../../data/page_cycler/morejs/www.yahoo.com/'
+    ]
+
+    for url in urls_list:
+      self.AddPage(MorejsPage(url, self))
diff --git a/tools/perf/page_sets/page_cycler/morejsnp.json b/tools/perf/page_sets/page_cycler/morejsnp.json
deleted file mode 100644
index 01b35a8..0000000
--- a/tools/perf/page_sets/page_cycler/morejsnp.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "description": "Morejsnp page_cycler benchmark",
-    "serving_dirs": ["../../../../data/page_cycler/morejsnp"],
-    "pages": [
-        { "url": "file://../../../../data/page_cycler/morejsnp/blog.chromium.org/" },
-        { "url": "file://../../../../data/page_cycler/morejsnp/dev.chromium.org/" },
-        { "url": "file://../../../../data/page_cycler/morejsnp/googleblog.blogspot.com1/" },
-        { "url": "file://../../../../data/page_cycler/morejsnp/googleblog.blogspot.com2/" },
-        { "url": "file://../../../../data/page_cycler/morejsnp/test.blogspot.com/" },
-        { "url": "file://../../../../data/page_cycler/morejsnp/www.igoogle.com/" },
-        { "url": "file://../../../../data/page_cycler/morejsnp/www.techcrunch.com/" },
-        { "url": "file://../../../../data/page_cycler/morejsnp/www.webkit.org/" },
-        { "url": "file://../../../../data/page_cycler/morejsnp/www.yahoo.com/" }
-    ]
-}
diff --git a/tools/perf/page_sets/page_cycler/morejsnp.py b/tools/perf/page_sets/page_cycler/morejsnp.py
new file mode 100644
index 0000000..5fe2f77
--- /dev/null
+++ b/tools/perf/page_sets/page_cycler/morejsnp.py
@@ -0,0 +1,39 @@
+# Copyright 2014 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.
+# pylint: disable=W0401,W0614
+from telemetry.page.actions.all_page_actions import *
+from telemetry.page import page as page_module
+from telemetry.page import page_set as page_set_module
+
+class MorejsnpPage(page_module.PageWithDefaultRunNavigate):
+
+  def __init__(self, url, page_set):
+    super(MorejsnpPage, self).__init__(url=url, page_set=page_set)
+
+
+class MorejsnpPageSet(page_set_module.PageSet):
+
+  """ Morejsnp page_cycler benchmark """
+
+  def __init__(self):
+    super(MorejsnpPageSet, self).__init__(
+      # pylint: disable=C0301
+      serving_dirs=set(['../../../../data/page_cycler/morejsnp']))
+
+    urls_list = [
+      'file://../../../../data/page_cycler/morejsnp/blog.chromium.org/',
+      'file://../../../../data/page_cycler/morejsnp/dev.chromium.org/',
+      # pylint: disable=C0301
+      'file://../../../../data/page_cycler/morejsnp/googleblog.blogspot.com1/',
+      # pylint: disable=C0301
+      'file://../../../../data/page_cycler/morejsnp/googleblog.blogspot.com2/',
+      'file://../../../../data/page_cycler/morejsnp/test.blogspot.com/',
+      'file://../../../../data/page_cycler/morejsnp/www.igoogle.com/',
+      'file://../../../../data/page_cycler/morejsnp/www.techcrunch.com/',
+      'file://../../../../data/page_cycler/morejsnp/www.webkit.org/',
+      'file://../../../../data/page_cycler/morejsnp/www.yahoo.com/'
+    ]
+
+    for url in urls_list:
+      self.AddPage(MorejsnpPage(url, self))
diff --git a/tools/perf/page_sets/page_cycler/moz.json b/tools/perf/page_sets/page_cycler/moz.json
deleted file mode 100644
index 2beccad..0000000
--- a/tools/perf/page_sets/page_cycler/moz.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-    "description": "Moz page_cycler benchmark",
-    "serving_dirs": ["../../../../data/page_cycler/moz"],
-    "pages": [
-        { "url": "file://../../../../data/page_cycler/moz/bugzilla.mozilla.org/" },
-        { "url": "file://../../../../data/page_cycler/moz/espn.go.com/" },
-        { "url": "file://../../../../data/page_cycler/moz/home.netscape.com/" },
-        { "url": "file://../../../../data/page_cycler/moz/hotwired.lycos.com/" },
-        { "url": "file://../../../../data/page_cycler/moz/lxr.mozilla.org/" },
-        { "url": "file://../../../../data/page_cycler/moz/my.netscape.com/" },
-        { "url": "file://../../../../data/page_cycler/moz/news.cnet.com/" },
-        { "url": "file://../../../../data/page_cycler/moz/slashdot.org/" },
-        { "url": "file://../../../../data/page_cycler/moz/vanilla-page/" },
-        { "url": "file://../../../../data/page_cycler/moz/web.icq.com/" },
-        { "url": "file://../../../../data/page_cycler/moz/www.altavista.com/" },
-        { "url": "file://../../../../data/page_cycler/moz/www.amazon.com/" },
-        { "url": "file://../../../../data/page_cycler/moz/www.aol.com/" },
-        { "url": "file://../../../../data/page_cycler/moz/www.apple.com/" },
-        { "url": "file://../../../../data/page_cycler/moz/www.cnn.com/" },
-        { "url": "file://../../../../data/page_cycler/moz/www.compuserve.com/" },
-        { "url": "file://../../../../data/page_cycler/moz/www.digitalcity.com/" },
-        { "url": "file://../../../../data/page_cycler/moz/www.ebay.com/" },
-        { "url": "file://../../../../data/page_cycler/moz/www.excite.com/" },
-        { "url": "file://../../../../data/page_cycler/moz/www.expedia.com/" },
-        { "url": "file://../../../../data/page_cycler/moz/www.google.com/" },
-        { "url": "file://../../../../data/page_cycler/moz/www.iplanet.com/" },
-        { "url": "file://../../../../data/page_cycler/moz/www.mapquest.com/" },
-        { "url": "file://../../../../data/page_cycler/moz/www.microsoft.com/" },
-        { "url": "file://../../../../data/page_cycler/moz/www.moviefone.com/" },
-        { "url": "file://../../../../data/page_cycler/moz/www.msn.com/" },
-        { "url": "file://../../../../data/page_cycler/moz/www.msnbc.com/" },
-        { "url": "file://../../../../data/page_cycler/moz/www.nytimes.com/" },
-        { "url": "file://../../../../data/page_cycler/moz/www.nytimes.com_Table/" },
-        { "url": "file://../../../../data/page_cycler/moz/www.quicken.com/" },
-        { "url": "file://../../../../data/page_cycler/moz/www.spinner.com/" },
-        { "url": "file://../../../../data/page_cycler/moz/www.sun.com/" },
-        { "url": "file://../../../../data/page_cycler/moz/www.time.com/" },
-        { "url": "file://../../../../data/page_cycler/moz/www.tomshardware.com/" },
-        { "url": "file://../../../../data/page_cycler/moz/www.travelocity.com/" },
-        { "url": "file://../../../../data/page_cycler/moz/www.voodooextreme.com/" },
-        { "url": "file://../../../../data/page_cycler/moz/www.w3.org_DOML2Core/" },
-        { "url": "file://../../../../data/page_cycler/moz/www.wired.com/" },
-        { "url": "file://../../../../data/page_cycler/moz/www.yahoo.com/" },
-        { "url": "file://../../../../data/page_cycler/moz/www.zdnet.com/" },
-        { "url": "file://../../../../data/page_cycler/moz/www.zdnet.com_Gamespot.com/" }
-    ]
-}
diff --git a/tools/perf/page_sets/page_cycler/moz.py b/tools/perf/page_sets/page_cycler/moz.py
new file mode 100644
index 0000000..e807ac7
--- /dev/null
+++ b/tools/perf/page_sets/page_cycler/moz.py
@@ -0,0 +1,69 @@
+# Copyright 2014 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.
+# pylint: disable=W0401,W0614
+from telemetry.page.actions.all_page_actions import *
+from telemetry.page import page as page_module
+from telemetry.page import page_set as page_set_module
+
+class MozPage(page_module.PageWithDefaultRunNavigate):
+
+  def __init__(self, url, page_set):
+    super(MozPage, self).__init__(url=url, page_set=page_set)
+
+
+class MozPageSet(page_set_module.PageSet):
+
+  """ Moz page_cycler benchmark """
+
+  def __init__(self):
+    super(MozPageSet, self).__init__(
+      # pylint: disable=C0301
+      serving_dirs=set(['../../../../data/page_cycler/moz']))
+
+    urls_list = [
+      'file://../../../../data/page_cycler/moz/bugzilla.mozilla.org/',
+      'file://../../../../data/page_cycler/moz/espn.go.com/',
+      'file://../../../../data/page_cycler/moz/home.netscape.com/',
+      'file://../../../../data/page_cycler/moz/hotwired.lycos.com/',
+      'file://../../../../data/page_cycler/moz/lxr.mozilla.org/',
+      'file://../../../../data/page_cycler/moz/my.netscape.com/',
+      'file://../../../../data/page_cycler/moz/news.cnet.com/',
+      'file://../../../../data/page_cycler/moz/slashdot.org/',
+      'file://../../../../data/page_cycler/moz/vanilla-page/',
+      'file://../../../../data/page_cycler/moz/web.icq.com/',
+      'file://../../../../data/page_cycler/moz/www.altavista.com/',
+      'file://../../../../data/page_cycler/moz/www.amazon.com/',
+      'file://../../../../data/page_cycler/moz/www.aol.com/',
+      'file://../../../../data/page_cycler/moz/www.apple.com/',
+      'file://../../../../data/page_cycler/moz/www.cnn.com/',
+      'file://../../../../data/page_cycler/moz/www.compuserve.com/',
+      'file://../../../../data/page_cycler/moz/www.digitalcity.com/',
+      'file://../../../../data/page_cycler/moz/www.ebay.com/',
+      'file://../../../../data/page_cycler/moz/www.excite.com/',
+      'file://../../../../data/page_cycler/moz/www.expedia.com/',
+      'file://../../../../data/page_cycler/moz/www.google.com/',
+      'file://../../../../data/page_cycler/moz/www.iplanet.com/',
+      'file://../../../../data/page_cycler/moz/www.mapquest.com/',
+      'file://../../../../data/page_cycler/moz/www.microsoft.com/',
+      'file://../../../../data/page_cycler/moz/www.moviefone.com/',
+      'file://../../../../data/page_cycler/moz/www.msn.com/',
+      'file://../../../../data/page_cycler/moz/www.msnbc.com/',
+      'file://../../../../data/page_cycler/moz/www.nytimes.com/',
+      'file://../../../../data/page_cycler/moz/www.nytimes.com_Table/',
+      'file://../../../../data/page_cycler/moz/www.quicken.com/',
+      'file://../../../../data/page_cycler/moz/www.spinner.com/',
+      'file://../../../../data/page_cycler/moz/www.sun.com/',
+      'file://../../../../data/page_cycler/moz/www.time.com/',
+      'file://../../../../data/page_cycler/moz/www.tomshardware.com/',
+      'file://../../../../data/page_cycler/moz/www.travelocity.com/',
+      'file://../../../../data/page_cycler/moz/www.voodooextreme.com/',
+      'file://../../../../data/page_cycler/moz/www.w3.org_DOML2Core/',
+      'file://../../../../data/page_cycler/moz/www.wired.com/',
+      'file://../../../../data/page_cycler/moz/www.yahoo.com/',
+      'file://../../../../data/page_cycler/moz/www.zdnet.com/',
+      'file://../../../../data/page_cycler/moz/www.zdnet.com_Gamespot.com/'
+    ]
+
+    for url in urls_list:
+      self.AddPage(MozPage(url, self))
diff --git a/tools/perf/page_sets/page_cycler/moz2.json b/tools/perf/page_sets/page_cycler/moz2.json
deleted file mode 100644
index 4a9ca47..0000000
--- a/tools/perf/page_sets/page_cycler/moz2.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-    "description": "Moz2 page_cycler benchmark",
-    "serving_dirs": ["../../../../data/page_cycler/moz2"],
-    "pages": [
-        { "url": "file://../../../../data/page_cycler/moz2/bugzilla.mozilla.org/" },
-        { "url": "file://../../../../data/page_cycler/moz2/espn.go.com/" },
-        { "url": "file://../../../../data/page_cycler/moz2/home.netscape.com/" },
-        { "url": "file://../../../../data/page_cycler/moz2/hotwired.lycos.com/" },
-        { "url": "file://../../../../data/page_cycler/moz2/lxr.mozilla.org/" },
-        { "url": "file://../../../../data/page_cycler/moz2/my.netscape.com/" },
-        { "url": "file://../../../../data/page_cycler/moz2/news.cnet.com/" },
-        { "url": "file://../../../../data/page_cycler/moz2/slashdot.org/" },
-        { "url": "file://../../../../data/page_cycler/moz2/vanilla-page/" },
-        { "url": "file://../../../../data/page_cycler/moz2/web.icq.com/" },
-        { "url": "file://../../../../data/page_cycler/moz2/www.altavista.com/" },
-        { "url": "file://../../../../data/page_cycler/moz2/www.amazon.com/" },
-        { "url": "file://../../../../data/page_cycler/moz2/www.aol.com/" },
-        { "url": "file://../../../../data/page_cycler/moz2/www.apple.com/" },
-        { "url": "file://../../../../data/page_cycler/moz2/www.cnn.com/" },
-        { "url": "file://../../../../data/page_cycler/moz2/www.compuserve.com/" },
-        { "url": "file://../../../../data/page_cycler/moz2/www.digitalcity.com/" },
-        { "url": "file://../../../../data/page_cycler/moz2/www.ebay.com/" },
-        { "url": "file://../../../../data/page_cycler/moz2/www.excite.com/" },
-        { "url": "file://../../../../data/page_cycler/moz2/www.expedia.com/" },
-        { "url": "file://../../../../data/page_cycler/moz2/www.google.com/" },
-        { "url": "file://../../../../data/page_cycler/moz2/www.iplanet.com/" },
-        { "url": "file://../../../../data/page_cycler/moz2/www.mapquest.com/" },
-        { "url": "file://../../../../data/page_cycler/moz2/www.microsoft.com/" },
-        { "url": "file://../../../../data/page_cycler/moz2/www.moviefone.com/" },
-        { "url": "file://../../../../data/page_cycler/moz2/www.msn.com/" },
-        { "url": "file://../../../../data/page_cycler/moz2/www.msnbc.com/" },
-        { "url": "file://../../../../data/page_cycler/moz2/www.nytimes.com/" },
-        { "url": "file://../../../../data/page_cycler/moz2/www.nytimes.com_Table/" },
-        { "url": "file://../../../../data/page_cycler/moz2/www.quicken.com/" },
-        { "url": "file://../../../../data/page_cycler/moz2/www.spinner.com/" },
-        { "url": "file://../../../../data/page_cycler/moz2/www.sun.com/" },
-        { "url": "file://../../../../data/page_cycler/moz2/www.time.com/" },
-        { "url": "file://../../../../data/page_cycler/moz2/www.tomshardware.com/" },
-        { "url": "file://../../../../data/page_cycler/moz2/www.travelocity.com/" },
-        { "url": "file://../../../../data/page_cycler/moz2/www.voodooextreme.com/" },
-        { "url": "file://../../../../data/page_cycler/moz2/www.w3.org_DOML2Core/" },
-        { "url": "file://../../../../data/page_cycler/moz2/www.wired.com/" },
-        { "url": "file://../../../../data/page_cycler/moz2/www.yahoo.com/" },
-        { "url": "file://../../../../data/page_cycler/moz2/www.zdnet.com/" },
-        { "url": "file://../../../../data/page_cycler/moz2/www.zdnet.com_Gamespot.com/" }
-    ]
-}
diff --git a/tools/perf/page_sets/page_cycler/moz2.py b/tools/perf/page_sets/page_cycler/moz2.py
new file mode 100644
index 0000000..6b7b1f8
--- /dev/null
+++ b/tools/perf/page_sets/page_cycler/moz2.py
@@ -0,0 +1,69 @@
+# Copyright 2014 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.
+# pylint: disable=W0401,W0614
+from telemetry.page.actions.all_page_actions import *
+from telemetry.page import page as page_module
+from telemetry.page import page_set as page_set_module
+
+class Moz2Page(page_module.PageWithDefaultRunNavigate):
+
+  def __init__(self, url, page_set):
+    super(Moz2Page, self).__init__(url=url, page_set=page_set)
+
+
+class Moz2PageSet(page_set_module.PageSet):
+
+  """ Description: Moz2 page_cycler benchmark """
+
+  def __init__(self):
+    super(Moz2PageSet, self).__init__(
+      # pylint: disable=C0301
+      serving_dirs=set(['../../../../data/page_cycler/moz2']))
+
+    urls_list = [
+      'file://../../../../data/page_cycler/moz2/bugzilla.mozilla.org/',
+      'file://../../../../data/page_cycler/moz2/espn.go.com/',
+      'file://../../../../data/page_cycler/moz2/home.netscape.com/',
+      'file://../../../../data/page_cycler/moz2/hotwired.lycos.com/',
+      'file://../../../../data/page_cycler/moz2/lxr.mozilla.org/',
+      'file://../../../../data/page_cycler/moz2/my.netscape.com/',
+      'file://../../../../data/page_cycler/moz2/news.cnet.com/',
+      'file://../../../../data/page_cycler/moz2/slashdot.org/',
+      'file://../../../../data/page_cycler/moz2/vanilla-page/',
+      'file://../../../../data/page_cycler/moz2/web.icq.com/',
+      'file://../../../../data/page_cycler/moz2/www.altavista.com/',
+      'file://../../../../data/page_cycler/moz2/www.amazon.com/',
+      'file://../../../../data/page_cycler/moz2/www.aol.com/',
+      'file://../../../../data/page_cycler/moz2/www.apple.com/',
+      'file://../../../../data/page_cycler/moz2/www.cnn.com/',
+      'file://../../../../data/page_cycler/moz2/www.compuserve.com/',
+      'file://../../../../data/page_cycler/moz2/www.digitalcity.com/',
+      'file://../../../../data/page_cycler/moz2/www.ebay.com/',
+      'file://../../../../data/page_cycler/moz2/www.excite.com/',
+      'file://../../../../data/page_cycler/moz2/www.expedia.com/',
+      'file://../../../../data/page_cycler/moz2/www.google.com/',
+      'file://../../../../data/page_cycler/moz2/www.iplanet.com/',
+      'file://../../../../data/page_cycler/moz2/www.mapquest.com/',
+      'file://../../../../data/page_cycler/moz2/www.microsoft.com/',
+      'file://../../../../data/page_cycler/moz2/www.moviefone.com/',
+      'file://../../../../data/page_cycler/moz2/www.msn.com/',
+      'file://../../../../data/page_cycler/moz2/www.msnbc.com/',
+      'file://../../../../data/page_cycler/moz2/www.nytimes.com/',
+      'file://../../../../data/page_cycler/moz2/www.nytimes.com_Table/',
+      'file://../../../../data/page_cycler/moz2/www.quicken.com/',
+      'file://../../../../data/page_cycler/moz2/www.spinner.com/',
+      'file://../../../../data/page_cycler/moz2/www.sun.com/',
+      'file://../../../../data/page_cycler/moz2/www.time.com/',
+      'file://../../../../data/page_cycler/moz2/www.tomshardware.com/',
+      'file://../../../../data/page_cycler/moz2/www.travelocity.com/',
+      'file://../../../../data/page_cycler/moz2/www.voodooextreme.com/',
+      'file://../../../../data/page_cycler/moz2/www.w3.org_DOML2Core/',
+      'file://../../../../data/page_cycler/moz2/www.wired.com/',
+      'file://../../../../data/page_cycler/moz2/www.yahoo.com/',
+      'file://../../../../data/page_cycler/moz2/www.zdnet.com/',
+      'file://../../../../data/page_cycler/moz2/www.zdnet.com_Gamespot.com/'
+    ]
+
+    for url in urls_list:
+      self.AddPage(Moz2Page(url, self))
diff --git a/tools/perf/page_sets/top_10.py b/tools/perf/page_sets/top_10.py
index fe2ee08..ae7e992 100644
--- a/tools/perf/page_sets/top_10.py
+++ b/tools/perf/page_sets/top_10.py
@@ -1,16 +1,13 @@
 # Copyright 2014 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.
+# pylint: disable=W0401,W0614
+from telemetry.page.actions.all_page_actions import *
+from telemetry.page import page as page_module
+from telemetry.page import page_set as page_set_module
 
-from telemetry.page.actions.navigate import NavigateAction
-from telemetry.page.actions.javascript import JavascriptAction
-from telemetry.page.actions.scroll import ScrollAction
-from telemetry.page.actions.wait import WaitAction
-from telemetry.page.page_set import PageSet
-from telemetry.page.page import Page
 
-
-class SimpleScrollPage(Page):
+class SimpleScrollPage(page_module.PageWithDefaultRunNavigate):
   def __init__(self, url, page_set, credentials=''):
     super(SimpleScrollPage, self).__init__(url, page_set=page_set)
     self.credentials = credentials
@@ -18,10 +15,6 @@ class SimpleScrollPage(Page):
   def RunSmoothness(self, action_runner):
     action_runner.RunAction(ScrollAction())
 
-  def RunNavigateSteps(self, action_runner):
-    action_runner.RunAction(NavigateAction())
-
-
 class Google(SimpleScrollPage):
   def __init__(self, page_set):
     super(Google, self).__init__(
@@ -93,7 +86,7 @@ class Facebook(SimpleScrollPage):
       {'condition': 'element', 'text': 'About'}))
 
 
-class Top10PageSet(PageSet):
+class Top10PageSet(page_set_module.PageSet):
   def __init__(self):
     super(Top10PageSet, self).__init__(
       description='10 Pages chosen from Alexa top sites',
diff --git a/tools/telemetry/telemetry/page/page_set.py b/tools/telemetry/telemetry/page/page_set.py
index 0413ea0..a0907865 100644
--- a/tools/telemetry/telemetry/page/page_set.py
+++ b/tools/telemetry/telemetry/page/page_set.py
@@ -159,6 +159,14 @@ class PageSet(object):
                          " with prefix 'PageSet'")
     page_set = page_set_classes[0]()
     page_set.file_path = file_path
+    # Makes sure that page_set's serving_dirs are absolute paths
+    if page_set.serving_dirs:
+      abs_serving_dirs = set()
+      for serving_dir in page_set.serving_dirs:
+        abs_serving_dirs.add(os.path.realpath(os.path.join(
+          page_set._base_dir,  # pylint: disable=W0212
+          serving_dir)))
+      page_set.serving_dirs = abs_serving_dirs
     for page in page_set.pages:
       page_class = page.__class__