Revert 288541 "For consistency with benchmark, rename unittest.o..."

tools/perf/benchmarks/benchmark_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 every benchmark that has a composable measurement.
 
 Ideally this test would be comprehensive, but the above serves as a
 kind of smoke test.
 """
 
 import os
 import unittest
 
 from telemetry import benchmark as benchmark_module
 from telemetry.core import discover
 from telemetry.page import page_test
 from telemetry.unittest import options_for_unittests
-from telemetry.unittest import progress_reporter
+from telemetry.unittest import output_formatter
 
 
 def SmokeTestGenerator(benchmark):
   # NOTE TO SHERIFFS: DO NOT DISABLE THIS TEST.
   #
   # This smoke test dynamically tests all benchmarks. So disabling it for one
   # failing or flaky benchmark would disable a much wider swath of coverage
   # than is usally intended. Instead, if a particular benchmark is failing,
   # disable it in tools/perf/benchmarks/*.
   @benchmark_module.Disabled('chromeos')  # crbug.com/351114
@@ skipping 23 matching lines @@
     benchmark.ProcessCommandLineArgs(None, options)
     benchmark_module.ProcessCommandLineArgs(None, options)
 
     self.assertEqual(0, SinglePageBenchmark().Run(options),
                      msg='Failed: %s' % benchmark)
 
   return BenchmarkSmokeTest
 
 
 def load_tests(_, _2, _3):
-  suite = progress_reporter.TestSuite()
+  suite = output_formatter.TestSuite()
 
   benchmarks_dir = os.path.dirname(__file__)
   top_level_dir = os.path.dirname(benchmarks_dir)
   measurements_dir = os.path.join(top_level_dir, 'measurements')
 
   all_measurements = discover.DiscoverClasses(
       measurements_dir, top_level_dir, page_test.PageTest,
       pattern='*.py').values()
   all_benchmarks = discover.DiscoverClasses(
       benchmarks_dir, top_level_dir, benchmark_module.Benchmark,
@@ skipping 12 matching lines @@
     if hasattr(benchmark, 'generated_profile_archive'):
       # We'd like to test these, but don't know how yet.
       continue
 
     class BenchmarkSmokeTest(unittest.TestCase):
       pass
     setattr(BenchmarkSmokeTest, benchmark.Name(), SmokeTestGenerator(benchmark))
     suite.addTest(BenchmarkSmokeTest(benchmark.Name()))
 
   return suite