Update perf page_set to use story_set

tools/perf/page_sets/tough_energy_cases.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 telemetry import story
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
 
 
 class ToughEnergyCasesPage(page_module.Page):
 
   def __init__(self, url, page_set):
     super(ToughEnergyCasesPage, self).__init__(
         url=url, page_set=page_set, credentials_path = 'data/credentials.json')
 
 class CodePenPage(ToughEnergyCasesPage):
 
@@ skipping 10 matching lines @@
         page_set=page_set)
     self.credentials = 'google2'
 
   def RunNavigateSteps(self, action_runner):
     super(GooglePage, self).RunNavigateSteps(action_runner)
     action_runner.WaitForJavaScriptCondition(
         'window.gmonkey !== undefined &&'
         'document.getElementById("gb") !== null')
 
 
-class ToughEnergyCasesPageSet(page_set_module.PageSet):
+class ToughEnergyCasesPageSet(story.StorySet):
   """Pages for measuring Chrome power draw."""
 
   def __init__(self):
     super(ToughEnergyCasesPageSet, self).__init__(
         archive_data_file='data/tough_energy_cases.json',
-        bucket=page_set_module.PARTNER_BUCKET)
+        cloud_storage_bucket=story.PARTNER_BUCKET)
 
     # TODO: this part of the test is disabled because it fails when
     # run with replay data and not with live data.  See crbug.com/465692
     # for complete details.
     # Why: productivity, top google properties
     #self.AddUserStory(GooglePage('https://mail.google.com/mail/', self))
 
     # Disabled: pegs CPU too much to get meaningful results.
     # Why: Image constantly changed in the background, above the fold
     # self.AddUserStory(CodePenPage(
@@ skipping 67 matching lines @@
     # self.AddUserStory(CodePenPage(
     #     'http://codepen.io/testificate364/debug/ckItK', self))
 
     # Why: flash video
     self.AddUserStory(CodePenPage(
         'http://codepen.io/testificate364/debug/slBue', self))
 
     # Why: Blank page in the foreground
     self.AddUserStory(CodePenPage(
         'http://codepen.io/testificate364/debug/HdIgr', self))