Move serving_dirs to UserStorySet, update user_story_runner.

tools/telemetry/telemetry/page/page_set.py

Index: tools/telemetry/telemetry/page/page_set.py
diff --git a/tools/telemetry/telemetry/page/page_set.py b/tools/telemetry/telemetry/page/page_set.py
index 7ad9114dbe1d8400c98064e1b13a0e9132cd2f41..bf0b9dac5c57f9ae95fc76227aba5fd1b3946dde 100644
--- a/tools/telemetry/telemetry/page/page_set.py
+++ b/tools/telemetry/telemetry/page/page_set.py
@@ -23,8 +23,6 @@ class PageSet(user_story_set.UserStorySet):
   def __init__(self, file_path=None, archive_data_file='', user_agent_type=None,
                make_javascript_deterministic=True, serving_dirs=None,
                bucket=None):
-    super(PageSet, self).__init__(
-        archive_data_file=archive_data_file, cloud_storage_bucket=bucket)
     # The default value of file_path is location of the file that define this
     # page set instance's class.
     # TODO(chrishenry): Move this logic to user_story_set. Consider passing
@@ -35,14 +33,15 @@ class PageSet(user_story_set.UserStorySet):
       # Turn pyc file into py files if we can
       if file_path.endswith('.pyc') and os.path.exists(file_path[:-1]):
         file_path = file_path[:-1]
-
     self.file_path = file_path
+
+    super(PageSet, self).__init__(
+        archive_data_file=archive_data_file, cloud_storage_bucket=bucket,
+        serving_dirs=serving_dirs)
+
     # These attributes can be set dynamically by the page set.
     self.user_agent_type = user_agent_type
     self.make_javascript_deterministic = make_javascript_deterministic
-    # Convert any relative serving_dirs to absolute paths.
-    self._serving_dirs = set(os.path.realpath(os.path.join(self.base_dir, d))
-                             for d in serving_dirs or [])
 
   @property
   def pages(self):
@@ -70,10 +69,6 @@ class PageSet(user_story_set.UserStorySet):
     else:
       return self.file_path
 
-  @property
-  def serving_dirs(self):
-    return self._serving_dirs
-
   def ContainsOnlyFileURLs(self):
     for page in self.user_stories:
       if not page.is_file: