Move PageSet._InitializeArchive to PageRunner

tools/perf/benchmarks/blink_perf.py

 # Copyright (c) 2013 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.
 
 import os
 
 from telemetry import test
 from telemetry.core import util
 from telemetry.page import page_measurement
-from telemetry.page import page as page_module
 from telemetry.page import page_set
 
 
-class BlinkPerfPageSet(page_set.PageSet):
-  def __init__(self, file_path, page_urls, serving_dirs):
-    super(BlinkPerfPageSet, self).__init__(file_path=file_path,
-                                           serving_dirs=serving_dirs)
-
-    for url in page_urls:
-      self.AddPage(page_module.PageWithDefaultRunNavigate(
-        url, page_set=self, base_dir=self._base_dir))
-    self._InitializeArchive()
-
-
 def _CreatePageSetFromPath(path):
   assert os.path.exists(path)
 
   page_urls = []
   serving_dirs = set()
 
   def _AddPage(path):
     if not path.endswith('.html'):
       return
     if '../' in open(path, 'r').read():
@@ skipping 18 matching lines @@
     skipped = []
     skipped_file = os.path.join(path, 'Skipped')
     if os.path.exists(skipped_file):
       for line in open(skipped_file, 'r').readlines():
         line = line.strip()
         if line and not line.startswith('#'):
           skipped.append(line.replace('/', os.sep))
     _AddDir(path, skipped)
   else:
     _AddPage(path)
-  return BlinkPerfPageSet(os.getcwd() + os.sep, page_urls, serving_dirs)
+  ps = page_set.PageSet(file_path=os.getcwd()+os.sep, serving_dirs=serving_dirs)
+  for url in page_urls:
+    ps.AddPageWithDefaultRunNavigate(url)
+  return ps
 
 
 class _BlinkPerfMeasurement(page_measurement.PageMeasurement):
   """Tuns a blink performance test and reports the results."""
   def __init__(self):
     super(_BlinkPerfMeasurement, self).__init__('')
     with open(os.path.join(os.path.dirname(__file__),
                            'blink_perf.js'), 'r') as f:
       self._blink_perf_js = f.read()
 
@@ skipping 50 matching lines @@
   tag = 'web_animations'
   test = _BlinkPerfMeasurement
 
   def CreatePageSet(self, options):
     path = os.path.join(util.GetChromiumSrcDir(),
         'third_party', 'WebKit', 'PerformanceTests', 'Animation')
     return _CreatePageSetFromPath(path)
 
   def CustomizeBrowserOptions(self, options):
     options.AppendExtraBrowserArgs('--enable-web-animations-css')