Add dependency_manager initialization to binary_manager

tools/telemetry/telemetry/benchmark_runner.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.
 
 """Parses the command line, discovers the appropriate benchmarks, and runs them.
 
 Handles benchmark configuration, but all the logic for
 actually running the benchmark is in Benchmark and PageRunner."""
 
 import hashlib
 import inspect
 import json
 import os
 import sys
 
 from telemetry import benchmark
 from telemetry.core import discover
 from telemetry import decorators
 from telemetry.internal.browser import browser_finder
 from telemetry.internal.browser import browser_options
+from telemetry.internal.util import binary_manager
 from telemetry.internal.util import command_line
 
 
 def PrintBenchmarkList(benchmarks, possible_browser, output_pipe=sys.stdout):
   """ Print benchmarks that are not filtered in the same order of benchmarks in
   the |benchmarks| list.
 
   Args:
     benchmarks: the list of benchmarks to be printed (in the same order of the
       list).
@@ skipping 37 matching lines @@
 
 class ProjectConfig(object):
   """Contains information about the benchmark runtime environment.
 
   Attributes:
     top_level_dir: A dir that contains benchmark, page test, and/or story
         set dirs and associated artifacts.
     benchmark_dirs: A list of dirs containing benchmarks.
     benchmark_aliases: A dict of name:alias string pairs to be matched against
         exactly during benchmark selection.
+    dependency_config: A path to a ProjectDependencies json file.
+    TODO(aiolos): Add link to description/example of a ProjectDependency file.

[eakuefner, 2015/08/10 17:07:03]

Can you move the todo out of the docstring itself?

[aiolos (Not reviewing), 2015/08/10 20:37:26]

Done.

   """
   def __init__(self, top_level_dir, benchmark_dirs=None,
-               benchmark_aliases=None):
+               benchmark_aliases=None, dependency_config=None):
     self._top_level_dir = top_level_dir
     self._benchmark_dirs = benchmark_dirs or []
     self._benchmark_aliases = benchmark_aliases or dict()
-
-    if benchmark_aliases:
-      self._benchmark_aliases = benchmark_aliases
-    else:
-      self._benchmark_aliases = {}
+    self._dependency_config = dependency_config
 
   @property
   def top_level_dir(self):
     return self._top_level_dir
 
   @property
   def benchmark_dirs(self):
     return self._benchmark_dirs
 
   @property
   def benchmark_aliases(self):
     return self._benchmark_aliases
 
+  @property
+  def dependency_config(self):
+    return self._dependency_config
 
 class Help(command_line.OptparseCommand):
   """Display help information about a command"""
 
   usage = '[command]'
 
   def Run(self, args):
     if len(args.positional_args) == 1:
       commands = _MatchingCommands(args.positional_args[0])
       if len(commands) == 1:
@@ skipping 289 matching lines @@
                           % (command_name, _ScriptName()))
     for command in commands:
       print >> sys.stderr, '  %-10s %s' % (
           command.Name(), command.Description())
     return 1
   if commands:
     command = commands[0]
   else:
     command = Run
 
+  binary_manager.InitDependencyManager(environment.dependency_config)
+
   # Parse and run the command.
   parser = command.CreateParser()
   command.AddCommandLineArgs(parser, environment)
   options, args = parser.parse_args()
   if commands:
     args = args[1:]
   options.positional_args = args
   command.ProcessCommandLineArgs(parser, options, environment)
   return command().Run(options)