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

tools/telemetry/telemetry/user_story/user_story_runner_unittest.py

Index: tools/telemetry/telemetry/user_story/user_story_runner_unittest.py
diff --git a/tools/telemetry/telemetry/user_story/user_story_runner_unittest.py b/tools/telemetry/telemetry/user_story/user_story_runner_unittest.py
index 6c5b8a65204cc122e635f7cb2515e558b9167734..7136fd1583464c3e6685c75b077b9e1ed604dc90 100644
--- a/tools/telemetry/telemetry/user_story/user_story_runner_unittest.py
+++ b/tools/telemetry/telemetry/user_story/user_story_runner_unittest.py
@@ -355,61 +355,6 @@ class UserStoryRunnerTest(unittest.TestCase):
     # The AppCrashException gets added as a failure.
     self.assertEquals(1, len(self.results.failures))
 
-  def testDiscardFirstResult(self):
-    us = user_story_set.UserStorySet()
-    us.AddUserStory(DummyLocalUserStory(TestSharedPageState))
-    us.AddUserStory(DummyLocalUserStory(TestSharedPageState))
-    class Measurement(page_test.PageTest):
-      @property
-      def discard_first_result(self):
-        return True
-
-      def RunPage(self, page, _, results):
-        results.AddValue(string.StringValue(page, 'test', 't', page.name))
-
-      def ValidateAndMeasurePage(self, page, tab, results):
-        pass
-
-    results = results_options.CreateResults(
-        EmptyMetadataForTest(), self.options)
-    user_story_runner.Run(
-        Measurement(), us, self.expectations, self.options, results)
-
-    self.assertEquals(0, GetNumberOfSuccessfulPageRuns(results))
-    self.assertEquals(0, len(results.failures))
-    self.assertEquals(0, len(results.all_page_specific_values))
-
-
-    results = results_options.CreateResults(
-        EmptyMetadataForTest(), self.options)
-    self.options.page_repeat = 1
-    self.options.pageset_repeat = 2
-    user_story_runner.Run(
-        Measurement(), us, self.expectations, self.options, results)
-    self.assertEquals(2, GetNumberOfSuccessfulPageRuns(results))
-    self.assertEquals(0, len(results.failures))
-    self.assertEquals(2, len(results.all_page_specific_values))
-
-    results = results_options.CreateResults(
-        EmptyMetadataForTest(), self.options)
-    self.options.page_repeat = 2
-    self.options.pageset_repeat = 1
-    user_story_runner.Run(
-        Measurement(), us, self.expectations, self.options, results)
-    self.assertEquals(2, GetNumberOfSuccessfulPageRuns(results))
-    self.assertEquals(0, len(results.failures))
-    self.assertEquals(2, len(results.all_page_specific_values))
-
-    results = results_options.CreateResults(
-        EmptyMetadataForTest(), self.options)
-    self.options.page_repeat = 1
-    self.options.pageset_repeat = 1
-    user_story_runner.Run(
-        Measurement(), us, self.expectations, self.options, results)
-    self.assertEquals(0, GetNumberOfSuccessfulPageRuns(results))
-    self.assertEquals(0, len(results.failures))
-    self.assertEquals(0, len(results.all_page_specific_values))
-
   def testPagesetRepeat(self):
     us = user_story_set.UserStorySet()
     us.AddUserStory(DummyLocalUserStory(TestSharedPageState, name='blank'))