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

Caused page cycler to hang on bots.

> [Telemetry] Make page cyclers more telemetric.
> 
> This causes the page cyclers to use page_sets instead of just navigating to the
> start page and letting the pages cycle themselves. This means we'll be using
> Telemetry "properly" which will allow us to record new page sets to update the
> page cyclers and it means that page cycler page sets are interchangeable with
> other benchmarks.
> 
> The page cyclers still measure the same thing as they measured previously: the
> time to load the page and perform a layout. However, they measure it differently
> now. Instead of setting a new Date().getTime() in the cookie immediately before
> navigating and then grabbing the finish Date in the onload handler, this now
> just grabs performance.now() in the onload handler. This returns the number of
> milliseconds since navigationStart where navigation start is the same as the
> immediately before navigation time marked before. I've verified locally that the
> times reported are consistent, and will monitor the bots to verify.
> 
> This involved moving the serving_dirs property up from the page to the page_set.
> 
> BUG=None
> TEST=All page cyclers on linux and morejs on windows
> NOTRY=True
> 
> Review URL: https://codereview.chromium.org/13817009

TBR=tonyg@chromium.org

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

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

1 files changed, 5 insertions, 31 deletions

diff --git a/tools/perf/page_sets/page_cycler/intl2.json b/tools/perf/page_sets/page_cycler/intl2.json
index b3520b7..ceb899a 100644
--- a/tools/perf/page_sets/page_cycler/intl2.json
+++ b/tools/perf/page_sets/page_cycler/intl2.json
@@ -1,36 +1,10 @@
 {
     "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/" }
+        {
+            "url": "file:///../../../../data/page_cycler/intl2/start.html?iterations=10&auto=1",
+            "serving_dirs": ["../../../../data/page_cycler/common",
+                             "../../../../data/page_cycler/intl2"]
+        }
     ]
 }