Refactor how we fetch Telemetry deps conditionally

tools/perf/fetch_benchmark_deps.py

 #!/usr/bin/env python
 # Copyright 2015 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.
 
 """This module fetches and prints the dependencies given a benchmark."""
 
 import argparse
 import os
 import sys
 
 from core import benchmark_finders
 from core import path_util
 
 path_util.AddPyUtilsToPath()
 from py_utils import cloud_storage
 
 path_util.AddTelemetryToPath()
 from telemetry import benchmark_runner
+# TODO(nedn): we should not rely on Telemetry private API.
+from telemetry.internal.browser import browser_options
 
 from chrome_telemetry_build import chromium_config
 
 
 def _FetchDependenciesIfNeeded(story_set):
   """ Download files needed by a user story set. """
+  if not story_set.wpr_archive_info:
+    return
+
   # Download files in serving_dirs.
   serving_dirs = story_set.serving_dirs
   for directory in serving_dirs:
     cloud_storage.GetFilesInDirectoryIfChanged(directory, story_set.bucket)
 
   # Download WPR files.
   if any(not story.is_local for story in story_set):
     story_set.wpr_archive_info.DownloadArchivesIfNeeded()
 
 
@@ skipping 17 matching lines @@
             os.path.join(dirpath, filename))
         if extension == '.sha1':
           deps.add(path_name)
 
   # Return relative paths.
   prefix_len = len(os.path.realpath(path_util.GetChromiumSrcDir())) + 1
   return [dep[prefix_len:] for dep in deps if dep]
 
 
 def FetchDepsForBenchmark(benchmark, output):
+  parser = browser_options.BrowserFinderOptions().CreateParser()
+  benchmark.AddCommandLineArgs(parser)
+  options, _ = parser.parse_args([])
+
   # Download files according to specified benchmark.
-  story_set = benchmark().CreateStorySet(None)
+  story_set = benchmark().CreateStorySet(options)
 
   _FetchDependenciesIfNeeded(story_set)
 
   # Print files downloaded.
   deps = _EnumerateDependencies(story_set)
   for dep in deps:
     print >> output, dep
 
 
 def main(args, output):
@@ skipping 14 matching lines @@
     benchmark = benchmark_runner.GetBenchmarkByName(
         options.benchmark_name, config)
     if not benchmark:
       raise ValueError('No such benchmark: %s' % options.benchmark_name)
     FetchDepsForBenchmark(benchmark, output)
   else:
     if not options.force:
       raw_input(
           'No benchmark name is specified. Fetching all benchmark deps. '
           'Press enter to continue...')
-    for b in benchmark_finders.GetAllBenchmarks():
+    for b in benchmark_finders.GetAllPerfBenchmarks():
       print >> output, ('Fetch dependencies for benchmark %s:'
-                        % benchmark.Name())
+                        % b.Name())

[jbudorick, 2017/06/06 17:08:15]

This fix should still land somewhere, whether in this CL or not.

       FetchDepsForBenchmark(b, output)
 
 if __name__ == '__main__':
   main(sys.argv[1:], sys.stdout)