[telemetry] Cleanups for benchmarks importing page sets.

tools/telemetry/telemetry/test.py

 # Copyright 2013 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 logging
 import optparse
 import os
 import shutil
 import sys
 import zipfile
@@ skipping 19 matching lines @@
 
   A test packages a PageTest/PageMeasurement and a PageSet together.
   """
   options = {}
 
   @classmethod
   def Name(cls):
     name = cls.__module__.split('.')[-1]
     if hasattr(cls, 'tag'):
       name += '.' + cls.tag
-    page_set_name = None
-    if hasattr(cls, 'page_set') and isinstance(cls.page_set, page_set.PageSet):
-      page_set_name = os.path.basename(
-          os.path.splitext(cls.page_set.file_path)[0])
-    elif hasattr(cls, 'page_set') and isinstance(cls.page_set, str):
-      page_set_name = os.path.basename(os.path.splitext(cls.page_set)[0])
-    if page_set_name:
-      name += '.' + page_set_name
+    if hasattr(cls, 'page_set'):
+      if isinstance(cls.page_set, basestring):
+        # TODO(dtu): Remove this code path after crbug.com/362293.
+        name += '.' + os.path.basename(os.path.splitext(cls.page_set)[0])
+      else:
+        name += '.' + cls.page_set.Name()
     return name
 
   @classmethod
   def AddCommandLineArgs(cls, parser):
     cls.PageTestClass().AddCommandLineArgs(parser)
 
     if hasattr(cls, 'AddTestCommandLineArgs'):
       group = optparse.OptionGroup(parser, '%s test options' % cls.Name())
       cls.AddTestCommandLineArgs(group)
       parser.add_option_group(group)
@@ skipping 105 matching lines @@
 
     If the Test has no PageTest, raises NotImplementedError.
     """
     if not hasattr(cls, 'test'):
       raise NotImplementedError('This test has no "test" attribute.')
     if not issubclass(cls.test, page_test.PageTest):
       raise TypeError('"%s" is not a PageTest.' % cls.test.__name__)
     return cls.test
 
   @classmethod
+  def PageSetClass(cls):
+    """Get the PageSet for this Test.
+
+    If the Test has no PageSet, raises NotImplementedError.
+    """
+    if not hasattr(cls, 'page_set'):
+      raise NotImplementedError('This test has no "page_set" attribute.')
+    if not issubclass(cls.page_set, page_set.PageSet):
+      raise TypeError('"%s" is not a PageSet.' % cls.page_set.__name__)
+    return cls.page_set
+
+  @classmethod
   def CreatePageSet(cls, options):  # pylint: disable=W0613
     """Get the page set this test will run on.
 
     By default, it will create a page set from the file at this test's
     page_set attribute. Override to generate a custom page set.
     """
     if not hasattr(cls, 'page_set'):
       raise NotImplementedError('This test has no "page_set" attribute.')
-
-    if isinstance(cls.page_set, str):
+    if isinstance(cls.page_set, basestring):
+      # TODO(dtu): Remove this code path after crbug.com/362293.
       return page_set.PageSet.FromFile(
           file_path=os.path.join(util.GetBaseDir(), cls.page_set))
-    elif isinstance(cls.page_set, page_set.PageSet):
-      return cls.page_set
     else:
-      raise TypeError('The page_set field of %s has unsupported type.' %
-                      cls.Name)
+      return cls.PageSetClass()()
 
   @classmethod
   def CreateExpectations(cls, ps):  # pylint: disable=W0613
     """Get the expectations this test will run with.
 
     By default, it will create an empty expectations set. Override to generate
     custom expectations.
     """
     if hasattr(cls, 'expectations'):
       return cls.expectations
     else:
       return test_expectations.TestExpectations()
 
 
 def AddCommandLineArgs(parser):
   page_runner.AddCommandLineArgs(parser)
 
 
 def ProcessCommandLineArgs(parser, args):
   page_runner.ProcessCommandLineArgs(parser, args)