[Cronet] Resurrect Android USB reverse tethering

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 30 matching lines @@
 import urllib
 
 REPOSITORY_ROOT = os.path.abspath(os.path.join(
     os.path.dirname(__file__), '..', '..', '..', '..', '..'))
 
 sys.path.append(os.path.join(REPOSITORY_ROOT, 'tools', 'perf'))
 from chrome_telemetry_build import chromium_config
 sys.path.append(chromium_config.GetTelemetryDir())
 sys.path.append(os.path.join(REPOSITORY_ROOT, 'build', 'android'))
 
+import android_rndis_forwarder
 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
 from telemetry import project_config
 from telemetry import story
-from telemetry.internal import forwarders
-from telemetry.internal.forwarders import android_forwarder
 from telemetry.value import scalar
 from telemetry.web_perf import timeline_based_measurement
 
 BUILD_TYPE = 'Release'
 BUILD_DIR = os.path.join(REPOSITORY_ROOT, 'out', BUILD_TYPE)
 QUIC_SERVER = os.path.join(BUILD_DIR, 'quic_server')
 QUIC_CLIENT = os.path.join(BUILD_DIR, 'quic_client')
 CERT_PATH = os.path.join('net', 'data', 'ssl', 'certificates')
 QUIC_CERT_DIR = os.path.join(REPOSITORY_ROOT, CERT_PATH)
 QUIC_CERT_HOST = 'test.example.com'
@@ skipping 38 matching lines @@
 # Add benchmark config to global state for easy access.
 globals().update(BENCHMARK_CONFIG)
 
 
 def GetDevice():
   devices = device_utils.DeviceUtils.HealthyDevices()
   assert len(devices) == 1
   return devices[0]
 
 
-def GetForwarderFactory(device):
-  return android_forwarder.AndroidForwarderFactory(device, True)
+def GetAndroidRndisConfig(device):
+  return android_rndis_forwarder.AndroidRndisConfigurator(device)
 
 
 def GetServersHost(device):
-  return GetForwarderFactory(device).host_ip
+  return GetAndroidRndisConfig(device).host_ip
 
 
 def GetHttpServerURL(device, resource):
   return 'http://%s:%d/%s' % (GetServersHost(device), HTTP_PORT, resource)
 
 
 class CronetPerfTestAndroidStory(android.AndroidStory):
   # Android AppStory implementation wrapping CronetPerfTest app.
   # Launches Cronet perf test app and waits for execution to complete
   # by waiting for presence of DONE_FILE.
@@ skipping 153 matching lines @@
   config_file.flush()
 
 
 def main():
   constants.SetBuildType(BUILD_TYPE)
   # Install APK
   device = GetDevice()
   device.EnableRoot()
   device.Install(APP_APK)
   # Start USB reverse tethering.
-  # Port map is ignored for tethering; must create one to placate assertions.
-  named_port_pair_map = {'http': (forwarders.PortPair(0, 0)),
-      'https': None, 'dns': None}
-  port_pairs = forwarders.PortPairs(**named_port_pair_map)
-  forwarder = GetForwarderFactory(device).Create(port_pairs)
+  android_rndis_forwarder.AndroidRndisForwarder(device,
+      GetAndroidRndisConfig(device))
   # Start HTTP server.
   http_server_doc_root = GenerateHttpTestResources()
   config_file = tempfile.NamedTemporaryFile()
   http_server = lighttpd_server.LighttpdServer(http_server_doc_root,
       port=HTTP_PORT, base_config_path=config_file.name)
   GenerateLighttpdConfig(config_file, http_server_doc_root, http_server)
   assert http_server.StartupHttpServer()
   config_file.close()
   # Start QUIC server.
   quic_server_doc_root = GenerateQuicTestResources(device)
@@ skipping 10 matching lines @@
       'binary_dependencies.json')
   with open(perf_config_file, "w") as config_file:
     config_file.write('{"config_type": "BaseConfig"}')
   runner_config = project_config.ProjectConfig(
       top_level_dir=top_level_dir,
       benchmark_dirs=[top_level_dir],
       client_configs=[perf_config_file],
       default_chrome_root=REPOSITORY_ROOT)
   sys.argv.insert(1, 'run')
   sys.argv.insert(2, 'run.CronetPerfTestBenchmark')
-  sys.argv.insert(3, '--android-rndis')
   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()