Revert of telemetry: Remove command line args from page test

tools/perf/benchmarks/benchmark_smoke_unittest.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.
 
 """Run the first page of one benchmark for every module.
 
 Only benchmarks that have a composable measurement are included.
 Ideally this test would be comprehensive, however, running one page
 of every benchmark would run impractically long.
 """
@@ skipping 59 matching lines @@
   measurements_dir = os.path.join(top_level_dir, 'measurements')
 
   all_measurements = discover.DiscoverClasses(
       measurements_dir, top_level_dir, page_test.PageTest).values()
   # Using the default of |index_by_class_name=False| means that if a module
   # has multiple benchmarks, only the last one is returned.
   all_benchmarks = discover.DiscoverClasses(
       benchmarks_dir, top_level_dir, benchmark_module.Benchmark,
       index_by_class_name=False).values()
   for benchmark in all_benchmarks:
-    if hasattr(benchmark, 'test') and benchmark.test not in all_measurements:
-      # If the benchmark does not have a measurement, then it is not composable.
+    if benchmark.PageTestClass() not in all_measurements:
+      # If the benchmark is not in measurements, then it is not composable.
       # Ideally we'd like to test these as well, but the non-composable
       # benchmarks are usually long-running benchmarks.
       continue
 
     # TODO(tonyg): Smoke doesn't work with session_restore yet.
     if (benchmark.Name().startswith('session_restore') or
         benchmark.Name().startswith('skpicture_printer')):
       continue
 
     if hasattr(benchmark, 'generated_profile_archive'):
@@ skipping 13 matching lines @@
     # in a class, and then throw the ones we don't need away instead.
     if hasattr(benchmark, '_enabled_strings'):
       method._enabled_strings = benchmark._enabled_strings
     if hasattr(benchmark, '_disabled_strings'):
       method._disabled_strings = benchmark._disabled_strings
     setattr(BenchmarkSmokeTest, benchmark.Name(), method)
 
     suite.addTest(BenchmarkSmokeTest(benchmark.Name()))
 
   return suite