Revert of Use page_set_module.PageSet instead of story.StorySet

tools/skp/page_sets/skia_gmail_nexus10.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.
 # pylint: disable=W0401,W0614
 
 
+from telemetry import story
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
 from telemetry.page import shared_page_state
 
 
 class SkiaBuildbotDesktopPage(page_module.Page):
 
   def __init__(self, url, page_set):
     super(SkiaBuildbotDesktopPage, self).__init__(
         url=url,
         page_set=page_set,
         credentials_path='data/credentials.json',
         shared_page_state_class=shared_page_state.Shared10InchTabletPageState)
     self.archive_data_file = 'data/skia_gmail_nexus10.json'
     self.credentials = 'google'
 
   def RunSmoothness(self, action_runner):
     action_runner.ScrollElement()
 
   def RunNavigateSteps(self, action_runner):
     action_runner.Navigate(self.url)
     action_runner.Wait(10)
 
 
-class SkiaGmailNexus10PageSet(page_set_module.PageSet):
+class SkiaGmailNexus10PageSet(story.StorySet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
     super(SkiaGmailNexus10PageSet, self).__init__(
       archive_data_file='data/skia_gmail_nexus10.json')
 
     urls_list = [
       # Why: productivity, top google properties
       'https://mail.google.com/mail/',
     ]
 
     for url in urls_list:
       self.AddUserStory(SkiaBuildbotDesktopPage(url, self))