Revert 194260 "Revert 194220 "[Telemetry] Make page cyclers more..."

trunk/src/tools/perf/page_sets/page_cycler/moz2.json

Index: trunk/src/tools/perf/page_sets/page_cycler/moz2.json
===================================================================
--- trunk/src/tools/perf/page_sets/page_cycler/moz2.json	(revision 194474)
+++ trunk/src/tools/perf/page_sets/page_cycler/moz2.json	(working copy)
@@ -1,10 +1,47 @@
 {
     "description": "Moz2 page_cycler benchmark",
+    "serving_dirs": ["../../../../data/page_cycler/moz2"],
     "pages": [
-        {
-            "url": "file:///../../../../data/page_cycler/moz2/start.html?iterations=10&auto=1",
-            "serving_dirs": ["../../../../data/page_cycler/common",
-                             "../../../../data/page_cycler/moz2"]
-        }
+        { "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/" }
     ]
 }