[Cronet] Get Cronet's javaperftest running again

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.
 2. Starts HTTP and QUIC servers on the host machine.
 3. Installs an Android app on the attached Android device and runs it.
 4. Collects the results from the app.
 
 Prerequisites:
 1. A rooted (i.e. "adb root" succeeds) Android device connected via a USB cable
    to the host machine (i.e. the computer running this script).
 2. quic_server has been built for the host machine, e.g. via:
      gn gen out/Release --args="is_debug=false"
      ninja -C out/Release quic_server
 3. cronet_perf_test_apk has been built for the Android device, e.g. via:
      ./components/cronet/tools/cr_cronet.py gn -r
      ninja -C out/Release cronet_perf_test_apk
+4. If "sudo ufw status" doesn't say "Status: inactive", run "sudo ufw disable".
+5. sudo apt-get install lighttpd
+6. If the usb0 interface on the host keeps losing it's IPv4 address
+   (WaitFor(HasHostAddress) will keep failing), NetworkManager may need to be
+   told to leave usb0 alone with these commands:
+     sudo bash -c "printf \"\\n[keyfile]\
+         \\nunmanaged-devices=interface-name:usb0\\n\" \
+         >> /etc/NetworkManager/NetworkManager.conf"
+     sudo service network-manager restart
 
 Invocation:
 ./run.py
 
 Output:
 Benchmark timings are output by telemetry to stdout and written to
 ./results.html
 
 """
 
@@ skipping 183 matching lines @@
 
   def __init__(self, quic_server_doc_root):
     self._process = None
     self._quic_server_doc_root = quic_server_doc_root
 
   def StartupQuicServer(self, device):
     # Chromium's presubmit checks aren't smart enough to understand
     # the redirect done in build/android/pylib/pexpect.py.
     # pylint: disable=no-member
     self._process = pexpect.spawn(QUIC_SERVER,
-                                  ['--quic_in_memory_cache_dir=%s' %
+                                  ['--quic_response_cache_dir=%s' %
                                       self._quic_server_doc_root,
                                    '--certificate_file=%s' % QUIC_CERT,
                                    '--key_file=%s' % QUIC_KEY,
                                    '--port=%d' % QUIC_PORT])
     assert self._process != None
     # Wait for quic_server to start serving.
     waited_s = 0
     while subprocess.call(['lsof', '-i', 'udp:%d' % QUIC_PORT, '-p',
                            '%d' % self._process.pid],
                           stdout=open(os.devnull, 'w')) != 0:
@@ skipping 102 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()