[Telemetry] Remove session_restore's use of PageTest.CanRunForPage.

tools/telemetry/telemetry/user_story/user_story_set.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.
 
 import inspect
 import os
 
 from telemetry import user_story as user_story_module
 from telemetry.wpr import archive_info
 
 
 class UserStorySet(object):
   """A collection of user story.
 
   A typical usage of UserStorySet would be to subclass it and then calling
-  AddUserStory for each UserStory..
+  AddUserStory for each UserStory.
   """
 
   def __init__(self, archive_data_file='', cloud_storage_bucket=None,
                serving_dirs=None):
     """Creates a new UserStorySet.
 
     Args:
       archive_data_file: The path to Web Page Replay's archive data, relative
           to self.base_dir.
       cloud_storage_bucket: The cloud storage bucket used to download
@@ skipping 36 matching lines @@
     """Lazily constructs wpr_archive_info if it's not set and returns it."""
     if self.archive_data_file and not self._wpr_archive_info:
       self._wpr_archive_info = archive_info.WprArchiveInfo.FromFile(
           os.path.join(self.base_dir, self.archive_data_file), self.bucket)
     return self._wpr_archive_info
 
   def AddUserStory(self, user_story):
     assert isinstance(user_story, user_story_module.UserStory)
     self.user_stories.append(user_story)
 
+  def RemoveUserStory(self, user_story):

[nednguyen, 2015/02/23 23:48:42]

Can you add unittest coverage for this new method?

+    """Removes a UserStory.
+
+    Allows the user stories to be filtered.
+    """
+    self.user_stories.remove(user_story)
+
   @classmethod
   def Name(cls):
-    """ Returns the string name of this UserStorySet.
+    """Returns the string name of this UserStorySet.
     Note that this should be a classmethod so benchmark_runner script can match
     user story class with its name specified in the run command:
     'Run <User story test name> <User story class name>'
     """
     return cls.__module__.split('.')[-1]
 
   @classmethod
   def Description(cls):
-    """ Return a string explaining in human-understandable terms what this
+    """Return a string explaining in human-understandable terms what this
     user story represents.
     Note that this should be a classmethod so benchmark_runner script can
-    display user stories' names along their descriptions in the list commmand.
+    display user stories' names along their descriptions in the list command.
     """
     if cls.__doc__:
       return cls.__doc__.splitlines()[0]
     else:
       return ''
 
   def ShuffleAndFilterUserStorySet(self, finder_options):
     pass
 
   def WprFilePathForUserStory(self, story):
-    """Convenient function to retrive WPR archive file path.
+    """Convenient function to retrieve WPR archive file path.
 
     Args:
       user_story: The UserStory to lookup.
 
     Returns:
       The WPR archive file path for the given UserStory, if found.
       Otherwise, return None.
     """
     if not self.wpr_archive_info:
       return None
     return self.wpr_archive_info.WprFilePathForUserStory(story)
 
   def __iter__(self):
     return self.user_stories.__iter__()
 
   def __len__(self):
     return len(self.user_stories)
 
   def __getitem__(self, key):
     return self.user_stories[key]
 
   def __setitem__(self, key, value):
     self.user_stories[key] = value