[Telemetry] Make "discard_first_result" apply to user_stories too.

tools/perf/measurements/page_cycler.py

 # Copyright 2012 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.
 
 """The page cycler measurement.
 
 This measurement registers a window load handler in which is forces a layout and
 then records the value of performance.now(). This call to now() measures the
 time from navigationStart (immediately after the previous page's beforeunload
 event) until after the layout in the page's load event. In addition, two garbage
@@ skipping 11 matching lines @@
 from metrics import keychain_metric
 from metrics import memory
 from metrics import power
 from metrics import speedindex
 from telemetry.core import util
 from telemetry.page import page_test
 from telemetry.value import scalar
 
 
 class PageCycler(page_test.PageTest):
-  def __init__(self, page_repeat, pageset_repeat, cold_load_percent=50,
+  def __init__(self, page_repeat, pageset_repeat, cold_load_percent,
                report_speed_index=False, clear_cache_before_each_run=False):
     super(PageCycler, self).__init__(
         action_name_to_run='RunPageInteractions',
         clear_cache_before_each_run=clear_cache_before_each_run)
 
     with open(os.path.join(os.path.dirname(__file__),
                            'page_cycler.js'), 'r') as f:
       self._page_cycler_js = f.read()
 
     self._report_speed_index = report_speed_index
@@ skipping 11 matching lines @@
       raise Exception('cold-load-percent must be in the range [0-100]')
 
     # Make sure _cold_run_start_index is an integer multiple of page_repeat.
     # Without this, --pageset_shuffle + --page_repeat could lead to
     # assertion failures on _started_warm in WillNavigateToPage.
     if cold_runs_percent_set:
       number_warm_pageset_runs = int(
           (int(pageset_repeat) - 1) * (100 - cold_load_percent) / 100)
       number_warm_runs = number_warm_pageset_runs * page_repeat
       self._cold_run_start_index = number_warm_runs + page_repeat
-      self._discard_first_result = (not cold_load_percent or
-                                    self._discard_first_result)
     else:
       self._cold_run_start_index = pageset_repeat * page_repeat
 
   def WillStartBrowser(self, platform):
     """Initialize metrics once right before the browser has been launched."""
     self._power_metric = power.PowerMetric(platform)
 
   def DidStartBrowser(self, browser):
     """Initialize metrics once right after the browser has been launched."""
     self._memory_metric = memory.MemoryMetric(browser)
@@ skipping 70 matching lines @@
 
   def ShouldRunCold(self, url):
     # We do the warm runs first for two reasons.  The first is so we can
     # preserve any initial profile cache for as long as possible.
     # The second is that, if we did cold runs first, we'd have a transition
     # page set during which we wanted the run for each URL to both
     # contribute to the cold data and warm the catch for the following
     # warm run, and clearing the cache before the load of the following
     # URL would eliminate the intended warmup for the previous URL.
     return (self._has_loaded_page[url] >= self._cold_run_start_index)