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

3 files changed, 8 insertions, 13 deletions

diff --git a/tools/telemetry/telemetry/page/page.py b/tools/telemetry/telemetry/page/page.py
index 1ec09e0..d7b075c 100644
--- a/tools/telemetry/telemetry/page/page.py
+++ b/tools/telemetry/telemetry/page/page.py
@@ -51,10 +51,10 @@ class Page(object):
 
     path = self.base_dir + parsed_url.netloc + parsed_url.path
 
-    if hasattr(self.page_set, 'serving_dirs'):
-      url_base_dir = os.path.commonprefix(self.page_set.serving_dirs)
+    if hasattr(self, 'serving_dirs'):
+      url_base_dir = os.path.commonprefix(self.serving_dirs)
       base_path = self.base_dir + '/' + url_base_dir
-      return ([self.base_dir + '/' + d for d in self.page_set.serving_dirs],
+      return ([self.base_dir + '/' + d for d in self.serving_dirs],
               path.replace(base_path, ''))
 
     return os.path.split(path)
diff --git a/tools/telemetry/telemetry/page/page_benchmark_results.py b/tools/telemetry/telemetry/page/page_benchmark_results.py
index 32eab68..b13e2b9 100644
--- a/tools/telemetry/telemetry/page/page_benchmark_results.py
+++ b/tools/telemetry/telemetry/page/page_benchmark_results.py
@@ -123,14 +123,12 @@ class PageBenchmarkResults(page_test.PageTestResults):
     if self.page_failures:
       return
 
-    # Print out the list of unique pages.
     unique_page_urls = []
     for page_values in self._page_results:
       url = page_values.page.display_url
       if unique_page_urls and unique_page_urls[0] == url:
         break
       unique_page_urls.append(url)
-    print 'Pages: [%s]' % ','.join(unique_page_urls)
 
     # Build the results summary.
     results_summary = defaultdict(list)
diff --git a/tools/telemetry/telemetry/page/page_unittest.py b/tools/telemetry/telemetry/page/page_unittest.py
index 9ef41ac..a7b0f9a 100644
--- a/tools/telemetry/telemetry/page/page_unittest.py
+++ b/tools/telemetry/telemetry/page/page_unittest.py
@@ -25,14 +25,11 @@ class TestPage(unittest.TestCase):
     self.assertEqual(filename, 'file.html')
 
   def testGetUrlBaseDirAndFileForUrlBaseDir(self):
-    ps = page_set.PageSet.FromDict({
-        'description': 'hello',
-        'archive_path': 'foo.wpr',
-        'serving_dirs': ['../../somedir/'],
-        'pages': [
-          {'url': 'file:///../../somedir/otherdir/file.html'}
-        ]}, 'basedir/')
-    serving_dirs, filename = ps[0].serving_dirs_and_file
+    apage = page.Page('file:///../../somedir/otherdir/file.html',
+                      None, # In this test, we don't need a page set.
+                      base_dir='basedir')
+    setattr(apage, 'serving_dirs', ['../../somedir/'])
+    serving_dirs, filename = apage.serving_dirs_and_file
     self.assertEqual(serving_dirs, ['basedir/../../somedir/'])
     self.assertEqual(filename, 'otherdir/file.html')