Move WPR-related attributes to UserStorySet.

tools/perf/measurements/session_restore.py

 # Copyright 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 collections
 
 from measurements import startup
 from metrics import cpu
 from metrics import startup_metric
 from telemetry.core import util
@@ skipping 38 matching lines @@
   def RunNavigateSteps(self, page, tab):
     # Overriden so that no page navigation occurs.
     pass
 
   def ValidatePageSet(self, page_set):
     wpr_archive_names_to_page_urls = collections.defaultdict(list)
     # Construct the map from pages' wpr archive names to pages' urls.
     for page in page_set:
       if page.is_local:
         continue
-      wpr_archive_name = page_set.WprFilePathForPage(page)
+      wpr_archive_name = page_set.WprFilePathForUserStory(page)
       wpr_archive_names_to_page_urls[wpr_archive_name].append(page.url)
 
     # Reject any pageset that contains more than one WPR archive.
     if len(wpr_archive_names_to_page_urls.keys()) > 1:
       raise Exception("Invalid pageset: more than 1 WPR archive found.: " +
           repr(wpr_archive_names_to_page_urls))
 
   def DidStartBrowser(self, browser):
     self._cpu_metric = cpu.CpuMetric(browser)
     self._cpu_metric.Start(None, None)
 
   def ValidateAndMeasurePage(self, page, tab, results):
     tab.WaitForDocumentReadyStateToBeComplete()
 
     # Record CPU usage from browser start to when the foreground page is loaded.
     self._cpu_metric.Stop(None, None)
     self._cpu_metric.AddResults(tab, results, 'cpu_utilization')
 
     startup_metric.StartupMetric().AddResults(tab, results)
 
     # TODO(jeremy): Measure time to load - first, last and frontmost tab here.