Update perf page_set to use story_set

tools/perf/page_sets/top_25_smooth.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.
+from page_sets import top_pages
+from telemetry import story
+from telemetry.page import page as page_module
 from telemetry.page import shared_page_state
-from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
-
-from page_sets import top_pages
 
 
 def _IssueMarkerAndScroll(action_runner):
   with action_runner.CreateGestureInteraction('ScrollAction'):
     action_runner.ScrollPage()
 
 
 def _CreatePageClassWithSmoothInteractions(page_cls):
   class DerivedSmoothPage(page_cls):  # pylint: disable=W0232
 
@@ skipping 51 matching lines @@
 
 class ESPNSmoothPage(top_pages.ESPNPage):
 
   """ Why: #1 sports """
 
   def RunPageInteractions(self, action_runner):
     with action_runner.CreateGestureInteraction('ScrollAction'):
       action_runner.ScrollPage(left_start_ratio=0.1)
 
 
-class Top25SmoothPageSet(page_set_module.PageSet):
+class Top25SmoothPageSet(story.StorySet):
 
   """ Pages hand-picked for 2012 CrOS scrolling tuning efforts. """
 
   def __init__(self):
     super(Top25SmoothPageSet, self).__init__(
         archive_data_file='data/top_25_smooth.json',
-        bucket=page_set_module.PARTNER_BUCKET)
+        cloud_storage_bucket=story.PARTNER_BUCKET)
 
     desktop_state_class = shared_page_state.SharedDesktopPageState
 
     self.AddUserStory(_CreatePageClassWithSmoothInteractions(
         top_pages.GoogleWebSearchPage)(self, desktop_state_class))
     self.AddUserStory(GmailSmoothPage(self, desktop_state_class))
     self.AddUserStory(GoogleCalendarSmoothPage(self, desktop_state_class))
     self.AddUserStory(_CreatePageClassWithSmoothInteractions(
         top_pages.GoogleImageSearchPage)(self, desktop_state_class))
     self.AddUserStory(GoogleDocSmoothPage(self, desktop_state_class))
@@ skipping 36 matching lines @@
         # Why: #1 Alexa reference
         'http://answers.yahoo.com',
         # Why: #1 Alexa sports
         'http://sports.yahoo.com/',
         # Why: top tech blog
         'http://techcrunch.com'
     ]
 
     for url in other_urls:
       self.AddUserStory(TopSmoothPage(url, self))