Revert of [Telemetry] Ensure that story display names are unique

telemetry/telemetry/page/page_run_end_to_end_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 os
 import re
 import shutil
 import sys
 import StringIO
 import tempfile
@@ skipping 125 matching lines @@
                                         self.formatted_exception,
                                         re.DOTALL | re.MULTILINE)
     self.assertEquals([expected_exception_name], actual_exception_names,
                       msg='Full formatted exception: %s' % '\n   > '.join(
                           self.formatted_exception.split('\n')))
 
   def testRaiseBrowserGoneExceptionFromRestartBrowserBeforeEachPage(self):
     self.CaptureFormattedException()
     story_set = story.StorySet()
     story_set.AddStory(page_module.Page(
-        'file://blank.html', story_set, base_dir=util.GetUnittestDataDir(),
-        name='foo'))
+        'file://blank.html', story_set, base_dir=util.GetUnittestDataDir()))
     story_set.AddStory(page_module.Page(
-        'file://blank.html', story_set, base_dir=util.GetUnittestDataDir(),
-        name='bar'))
+        'file://blank.html', story_set, base_dir=util.GetUnittestDataDir()))
     story_set.AddStory(page_module.Page(
-        'file://blank.html', story_set, base_dir=util.GetUnittestDataDir(),
-        name='baz'))
+        'file://blank.html', story_set, base_dir=util.GetUnittestDataDir()))
 
     class Test(legacy_page_test.LegacyPageTest):
 
       def __init__(self, *args):
         super(Test, self).__init__(
             *args, needs_browser_restart_after_each_page=True)
         self.run_count = 0
 
       def RestartBrowserBeforeEachPage(self):
         # This will only be called twice with 3 pages.
@@ skipping 15 matching lines @@
     story_runner.Run(test, story_set, options, results)
     self.assertEquals(2, test.run_count)
     self.assertEquals(2, len(GetSuccessfulPageRuns(results)))
     self.assertEquals(1, len(results.failures))
     self.assertFormattedExceptionIsEmpty()
 
   def testNeedsBrowserRestartAfterEachPage(self):
     self.CaptureFormattedException()
     story_set = story.StorySet()
     story_set.AddStory(page_module.Page(
-        'file://blank.html', story_set, base_dir=util.GetUnittestDataDir(),
-        name='foo'))
+        'file://blank.html', story_set, base_dir=util.GetUnittestDataDir()))
     story_set.AddStory(page_module.Page(
-        'file://blank.html', story_set, base_dir=util.GetUnittestDataDir(),
-        name='bar'))
+        'file://blank.html', story_set, base_dir=util.GetUnittestDataDir()))
 
     class Test(legacy_page_test.LegacyPageTest):
 
       def __init__(self, *args, **kwargs):
         super(Test, self).__init__(*args, **kwargs)
         self.browser_starts = 0
 
       def DidStartBrowser(self, *args):
         super(Test, self).DidStartBrowser(*args)
         self.browser_starts += 1
@@ skipping 321 matching lines @@
     finally:
       shutil.rmtree(options.output_dir)
 
   def _RunPageTestThatRaisesAppCrashException(self, test, max_failures):
     class TestPage(page_module.Page):
 
       def RunNavigateSteps(self, _):
         raise exceptions.AppCrashException
 
     story_set = story.StorySet()
-    for i in range(5):
+    for _ in range(5):
       story_set.AddStory(
           TestPage('file://blank.html', story_set,
-                   base_dir=util.GetUnittestDataDir(), name='foo%d' % i))
+                   base_dir=util.GetUnittestDataDir()))
     options = options_for_unittests.GetCopy()
     options.output_formats = ['none']
     options.suppress_gtest_report = True
     SetUpStoryRunnerArguments(options)
     results = results_options.CreateResults(EmptyMetadataForTest(), options)
     story_runner.Run(test, story_set, options, results,
                      max_failures=max_failures)
     return results
 
   def testSingleTabMeansCrashWillCauseFailureValue(self):
@@ skipping 185 matching lines @@
                   results.pages_to_profiling_files)
     screenshot_file_path = (
         results.pages_to_profiling_files[failing_page][0].GetAbsPath())
     try:
       actual_screenshot_img = image_util.FromPngFile(screenshot_file_path)
       self.assertTrue(image_util.AreEqual(
                       image_util.FromBase64Png(expected_png_base64),
                       actual_screenshot_img))
     finally:  # Must clean up screenshot file if exists.
       os.remove(screenshot_file_path)