| Index: content/test/gpu/page_sets/__init__.py
 | 
| diff --git a/content/test/gpu/page_sets/__init__.py b/content/test/gpu/page_sets/__init__.py
 | 
| index ccb12f67bfc8f3b5ce313a64fcfc06de5c97592f..7d6dd796b8ec9dd39bf39ef686fedf746e7a0def 100644
 | 
| --- a/content/test/gpu/page_sets/__init__.py
 | 
| +++ b/content/test/gpu/page_sets/__init__.py
 | 
| @@ -4,14 +4,13 @@
 | 
|  import os
 | 
|  import sys
 | 
|  
 | 
| -from telemetry.core import discover
 | 
|  from telemetry.story import story_set
 | 
| +from telemetry.util import classes_util
 | 
|  
 | 
|  
 | 
|  # Import all submodules' StorySet classes.
 | 
|  start_dir = os.path.dirname(os.path.abspath(__file__))
 | 
|  top_level_dir = os.path.dirname(start_dir)
 | 
|  base_class = story_set.StorySet
 | 
| -for cls in discover.DiscoverClasses(
 | 
| -    start_dir, top_level_dir, base_class).values():
 | 
| +for cls in classes_util.DiscoverClasses(start_dir, top_level_dir, base_class):
 | 
|    setattr(sys.modules[__name__], cls.__name__, cls)
 | 
| 
 |