[Telemetry] Update all clients to use chromium_config.GetTelemetryDir()

components/cronet/android/test/javaperftests/run.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 script runs an automated Cronet performance benchmark.
 
 This script:
 1. Sets up "USB reverse tethering" which allow network traffic to flow from
    an Android device connected to the host machine via a USB cable.
@@ skipping 25 matching lines @@
 import shutil
 import subprocess
 import sys
 import tempfile
 from time import sleep
 import urllib
 
 REPOSITORY_ROOT = os.path.abspath(os.path.join(
     os.path.dirname(__file__), '..', '..', '..', '..', '..'))
 
-sys.path.append(os.path.join(REPOSITORY_ROOT, 'tools', 'telemetry'))
+sys.path.append(os.path.join(REPOSITORY_ROOT, 'tools', 'perf'))

[aiolos (Not reviewing), 2016/01/15 00:33:04]

Nit: You might want to check if it's already in the path before you add it.
(Similarly in the other files.)

[eakuefner, 2016/01/19 17:21:18]

Acknowledged, but I think I'll leave that up to the authors of client code. I
want to avoid making functional changes broader than switching the way that
Telemetry is referred to, and in this case, for example, I don't see why it
would be more likely for perf to have a double entry in the path than Telemetry.

+from chrome_telemetry_build import chromium_config
+sys.path.append(chromium_config.GetTelemetryDir())
 sys.path.append(os.path.join(REPOSITORY_ROOT, 'build', 'android'))
 
 import lighttpd_server
 from pylib import constants
 from pylib import pexpect
 from pylib.device import device_utils
 from pylib.device import intent
 from telemetry import android
 from telemetry import benchmark
 from telemetry import benchmark_runner
@@ skipping 261 matching lines @@
   benchmark_runner.main(runner_config)
   # Shutdown.
   quic_server.ShutdownQuicServer()
   shutil.rmtree(quic_server_doc_root)
   http_server.ShutdownHttpServer()
   shutil.rmtree(http_server_doc_root)
 
 
 if __name__ == '__main__':
   main()