Move PageSet._InitializeArchive to PageRunner

tools/perf/page_sets/page_set_unittest.py

 # 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.
 
 import logging
 import os
 import unittest
 
 from telemetry.core import discover
 from telemetry.page import page_set as page_set_module
 from telemetry.page import page_set_archive_info
 
 
 class PageSetUnitTest(unittest.TestCase):
 
   def testSmoke(self):
     # Instantiate all page sets and verify that all URLs have an associated
     # archive.
     page_sets_dir = os.path.dirname(__file__)
     page_sets = discover.GetAllPageSetFilenames(page_sets_dir)
     for path in page_sets:
-      page_set = page_set_module.PageSet.FromFile(path, ignore_archive=True)
+      page_set = page_set_module.PageSet.FromFile(path)
 
       # TODO: Eventually these should be fatal.
       if not page_set.archive_data_file:
         logging.warning('Skipping %s: missing archive data file', path)
         continue
       if not os.path.exists(os.path.join(page_sets_dir,
                                          page_set.archive_data_file)):
         logging.warning('Skipping %s: archive data file not found', path)
         continue
 
       wpr_archive_info = page_set_archive_info.PageSetArchiveInfo.FromFile(
-          os.path.join(page_sets_dir, page_set.archive_data_file),
-          ignore_archive=True)
+        os.path.join(page_sets_dir, page_set.archive_data_file),
+        ignore_archive=True)
 
       logging.info('Testing %s', path)
       for page in page_set.pages:
         if not page.url.startswith('http'):
           continue
         self.assertTrue(wpr_archive_info.WprFilePathForPage(page),
                         msg='No archive found for %s in %s' % (
                             page.url, page_set.archive_data_file))