[telemetry] Cleanups for benchmarks importing page sets.

tools/perf/benchmarks/peacekeeper.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.
 
 """PeaceKeeper benchmark suite.
 
 Peacekeeper measures browser's performance by testing its JavaScript
 functionality. JavaScript is a widely used programming language used in the
 creation of modern websites to provide features such as animation, navigation,
 forms and other common requirements. By measuring a browser's ability to handle
@@ skipping 60 matching lines @@
 class PeaceKeeperBenchmark(test.Test):
   """A base class for Peackeeper benchmarks."""
   test = _PeaceKeeperMeasurement
 
   def CreatePageSet(self, options):
     """Makes a PageSet for PeaceKeeper benchmarks."""
     # Subclasses are expected to define a class member called query_param.
     if not hasattr(self, 'test_param'):
       raise NotImplementedError('test_param not in PeaceKeeper benchmark.')
 
-    # The docstring of benchmark classes may also be used as a description
-    # when 'run_benchmarks list' is run.
-    description = self.__doc__ or 'PeaceKeeper Benchmark'
     ps = page_set.PageSet(
-      description=description,
       archive_data_file='../page_sets/data/peacekeeper_%s.json' % self.tag,
       make_javascript_deterministic=False)
     for test_name in self.test_param:
       ps.AddPageWithDefaultRunNavigate(
         ('http://peacekeeper.futuremark.com/run.action?debug=true&'
          'repeat=false&forceSuiteName=%s&forceTestName=%s') %
         (self.tag, test_name))
     return ps
 
 
@@ skipping 147 matching lines @@
   tag = 'html5'
   test_param = ['webglSphere',
                 'gamingSpitfire',
                 'videoCodecH264',
                 'videoCodecTheora',
                 'videoCodecWebM',
                 'videoPosterSupport',
                 'workerContrast01',
                 'workerContrast02'
                 ]