Move user_story.user_story_runner to story.story_runner.

tools/perf/measurements/page_cycler_unittest.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 sys
 import unittest
 
 from telemetry.core import browser_options
+from telemetry.internal import story_runner
 from telemetry.results import page_test_results
 from telemetry.unittest_util import simple_mock
-from telemetry.user_story import user_story_runner
 
 from measurements import page_cycler
 from metrics import keychain_metric
 
 
 # Allow testing protected members in the unit test.
 # pylint: disable=W0212
 
 class MockMemoryMetric(object):
   """Used instead of simple_mock.MockObject so that the precise order and
@@ skipping 85 matching lines @@
   def SetUpCycler(self, page_repeat=1, pageset_repeat=10, cold_load_percent=50,
                   report_speed_index=False, setup_memory_module=False):
     cycler = page_cycler.PageCycler(
         page_repeat = page_repeat,
         pageset_repeat = pageset_repeat,
         cold_load_percent = cold_load_percent,
         report_speed_index = report_speed_index)
     options = browser_options.BrowserFinderOptions()
     options.browser_options.platform = FakePlatform()
     parser = options.CreateParser()
-    user_story_runner.AddCommandLineArgs(parser)
+    story_runner.AddCommandLineArgs(parser)
     args = ['--page-repeat=%i' % page_repeat,
             '--pageset-repeat=%i' % pageset_repeat]
     parser.parse_args(args)
-    user_story_runner.ProcessCommandLineArgs(parser, options)
+    story_runner.ProcessCommandLineArgs(parser, options)
     cycler.CustomizeBrowserOptions(options.browser_options)
 
     if setup_memory_module:
       # Mock out memory metrics; the real ones require a real browser.
       mock_memory_metric = MockMemoryMetric()
 
       mock_memory_module = simple_mock.MockObject()
       mock_memory_module.ExpectCall(
         'MemoryMetric').WithArgs(simple_mock.DONT_CARE).WillReturn(
         mock_memory_metric)
@@ skipping 120 matching lines @@
     # does an initial navigate to avoid paying for a cross-renderer navigation.
     cycler = self.SetUpCycler(setup_memory_module=True)
     pages = [FakePage('file://fakepage1.com'), FakePage('file://fakepage2.com')]
     tab = FakeTab()
 
     self.assertEqual([], tab.navigated_urls)
     for page in pages * 2:
       cycler.WillNavigateToPage(page, tab)
       self.assertEqual(
           ['http://fakeserver:99999/nonexistent.html'], tab.navigated_urls)