Android Loading Tools: use computed adb path for cert install

tools/android/loading/device_setup.py

 # 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.
 
 import collections
 import contextlib
 import logging
 import os
 import shutil
 import subprocess
 import sys
 import tempfile
 import time
 
 _SRC_DIR = os.path.abspath(os.path.join(
     os.path.dirname(__file__), '..', '..', '..'))
 
 _CATAPULT_DIR = os.path.join(_SRC_DIR, 'third_party', 'catapult')
 sys.path.append(os.path.join(_CATAPULT_DIR, 'devil'))
 from devil.android import device_utils
 from devil.android import flag_changer
 from devil.android import forwarder
+from devil.android.sdk import adb_wrapper
 from devil.android.sdk import intent
 
 sys.path.append(os.path.join(_SRC_DIR, 'build', 'android'))
 from pylib import constants
 from video_recorder import video_recorder
 
 sys.path.append(os.path.join(_SRC_DIR, 'tools', 'perf'))
 from chrome_telemetry_build import chromium_config
 
 sys.path.append(chromium_config.GetTelemetryDir())
@@ skipping 175 matching lines @@
     wpr_server_args.extend(['--should_generate_certs',
         '--https_root_ca_cert_path=' + PathWorkaround(wpr_ca_cert_path)])
   if out_log_path:
     # --log_level debug to extract the served URLs requests from the log.
     wpr_server_args.extend(['--log_level', 'debug',
                             '--log_file', PathWorkaround(out_log_path)])
     # Don't append to previously existing log.
     if os.path.exists(out_log_path):
       os.remove(out_log_path)
 
-  # Set up WPR server and device forwarder.
+#Set up WPR server and device forwarder.

[Benoit L, 2017/03/02 09:43:08]

nit: remove this from the diff.

[mattcary, 2017/03/02 09:55:16]

oops, thanks

   server = wpr_server.ReplayServer(PathWorkaround(wpr_archive_path),
       '127.0.0.1', 0, 0, None, wpr_server_args)
   http_port, https_port = server.StartServer()[:-1]
 
   logging.info('WPR server listening on HTTP=%s, HTTPS=%s (options=%s)' % (
       http_port, https_port, wpr_server_args))
   try:
     yield http_port, https_port
   finally:
     server.StopServer()
@@ skipping 82 matching lines @@
   if wpr_archive_path == None:
     _VerifySilentWprHost(record, network_condition_name)
     yield []
     return
   # Deploy certification authority to the device.
   temp_certificate_dir = tempfile.mkdtemp()
   wpr_ca_cert_path = os.path.join(temp_certificate_dir, 'testca.pem')
   certutils.write_dummy_ca_cert(*certutils.generate_dummy_ca_cert(),
                                 cert_path=wpr_ca_cert_path)
   device_cert_util = adb_install_cert.AndroidCertInstaller(
-      device.adb.GetDeviceSerial(), None, wpr_ca_cert_path)
+      device.adb.GetDeviceSerial(), None, wpr_ca_cert_path,
+      adb_wrapper.AdbWrapper.GetAdbPath())
   device_cert_util.install_cert(overwrite_cert=True)
   try:
     # Set up WPR server
     with _WprHost(
         wpr_archive_path,
         record=record,
         network_condition_name=network_condition_name,
         disable_script_injection=disable_script_injection,
         wpr_ca_cert_path=wpr_ca_cert_path,
         out_log_path=out_log_path) as (http_port, https_port):
@@ skipping 91 matching lines @@
     # speed index measurement.
     connection.ExecuteJavaScript("""
       (function() {
         requestAnimationFrame(function() {
           var screen = window.__speedindex_screen;
           screen.style.background = 'rgb(255, 255, 255)';
         });
       })();
     """)
     yield