sandwich: Uplift for production use.

tools/android/loading/sandwich.py

 #! /usr/bin/env python
 # Copyright 2016 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.
 
 """Instructs Chrome to load series of web pages and reports results.
 
 When running Chrome is sandwiched between preprocessed disk caches and
 WepPageReplay serving all connections.
 """
@@ skipping 144 matching lines @@
         source_dir=args.source_dir, communication_dir=out_path) as server:
       address = server.Address()
       runner.url = 'http://%s/%s' % (address, args.page)
       runner.Run()
     trace_path = os.path.join(
         out_path, 'run', '0', sandwich_runner.TRACE_FILENAME)
     shutil.copy(trace_path, args.output)
   return 0
 
 
-def _GenerateBenchmarkTasks(args, url, output_subdirectory):
+def _GenerateBenchmarkTasks(args, android_device, url, output_subdirectory):
   MAIN_TRANSFORMER_LIST_NAME = 'no-network-emulation'
   common_builder = sandwich_utils.SandwichCommonBuilder(
-      android_device=_GetAndroidDeviceFromArgs(args),
+      android_device=android_device,
       url=url,
       output_directory=args.output,
       output_subdirectory=output_subdirectory)
   if args.wpr_archive_path:
     common_builder.OverridePathToWprArchive(args.wpr_archive_path)
   else:
     common_builder.PopulateWprRecordingTask()
 
   def MainTransformer(runner):
     runner.record_video = _SPEED_INDEX_MEASUREMENT in args.optional_measures
@@ skipping 33 matching lines @@
         transformer_list = [MainTransformer, network_transformer]
         builder.PopulateBenchmark(enable_swr, transformer_list_name,
                                   transformer_list)
   return common_builder.default_final_tasks
 
 
 def _RunAllMain(args):
   urls = ReadUrlsFromCorpus(args.corpus)
   domain_times_encountered_per_domain = {}
   default_final_tasks = []
+  android_device = _GetAndroidDeviceFromArgs(args)
   for url in urls:
     domain = '.'.join(urlparse(url).netloc.split('.')[-2:])
     domain_times_encountered = domain_times_encountered_per_domain.get(
         domain, 0)
     output_subdirectory = '{}.{}'.format(domain, domain_times_encountered)
     domain_times_encountered_per_domain[domain] = domain_times_encountered + 1
     default_final_tasks.extend(
-        _GenerateBenchmarkTasks(args, url, output_subdirectory))
+        _GenerateBenchmarkTasks(args, android_device, url, output_subdirectory))
   return task_manager.ExecuteWithCommandLine(args, default_final_tasks)
 
 
 def main(command_line_args):
   logging.basicConfig(level=logging.INFO)
   devil_chromium.Initialize()
 
   args = _ArgumentParser().parse_args(command_line_args)
   OPTIONS.SetParsedArgs(args)
 
   if args.subcommand == 'record-test-trace':
     return _RecordWebServerTestTrace(args)
   if args.subcommand == 'run':
     return _RunAllMain(args)
   if args.subcommand == 'collect-csv':
     with args.output_csv as output_file:
       if not csv_util.CollectCSVsFromDirectory(args.output_dir, output_file):
         return 1
     return 0
   assert False
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))