Plumb Telemetry test name through to results object creation

tools/telemetry/telemetry/page/profile_generator.py

-# Copyright 2013 The Chromium Authors. All rights reserved.
+# 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.
 
 """Handles generating profiles and transferring them to/from mobile devices."""
 
 import logging
 import optparse
 import os
 import shutil
 import stat
 import sys
 import tempfile
 
+from telemetry import benchmark
 from telemetry.core import browser_options
 from telemetry.core import discover
 from telemetry.core import util
 from telemetry.page import page_runner
 from telemetry.page import profile_creator
 from telemetry.page import test_expectations
+from telemetry.results import results_options
 
 
 def _DiscoverProfileCreatorClasses():
   profile_creators_dir = os.path.abspath(os.path.join(util.GetBaseDir(),
       os.pardir, 'perf', 'profile_creators'))
   base_dir = os.path.abspath(os.path.join(profile_creators_dir, os.pardir))
 
   profile_creators_unfiltered = discover.DiscoverClasses(
       profile_creators_dir, base_dir, profile_creator.ProfileCreator)
 
@@ skipping 34 matching lines @@
   return ignore_list
 
 def GenerateProfiles(profile_creator_class, profile_creator_name, options):
   """Generate a profile"""
   expectations = test_expectations.TestExpectations()
   test = profile_creator_class()
 
   temp_output_directory = tempfile.mkdtemp()
   options.output_profile_path = temp_output_directory
 
-  results = page_runner.Run(test, test.page_set, expectations, options)
+  results = results_options.CreateResults(
+      benchmark.BenchmarkMetadata(test.__class__.__name__), options)
+  page_runner.Run(test, test.page_set, expectations, options, results)
 
   if results.failures:
     logging.warning('Some pages failed.')
     logging.warning('Failed pages:\n%s',
                     '\n'.join(results.pages_that_failed))
     return 1
 
   # Everything is a-ok, move results to final destination.
   generated_profiles_dir = os.path.abspath(options.output_dir)
   if not os.path.exists(generated_profiles_dir):
@@ skipping 54 matching lines @@
       "%%prog <--profile-type-to-generate=...> <--browser=...> <--output-dir>")
   AddCommandLineArgs(parser)
   _, _ = parser.parse_args()
   ProcessCommandLineArgs(parser, options)
 
   # Generate profile.
   profile_creators = _DiscoverProfileCreatorClasses()
   profile_creator_class = profile_creators[options.profile_type_to_generate]
   return GenerateProfiles(profile_creator_class,
       options.profile_type_to_generate, options)