[Cronet] Use Https for Quic Test Server

build/android/pylib/instrumentation/setup.py

 # Copyright 2013 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.
 
 """Generates test runner factory and tests for instrumentation tests."""
 
 import logging
 import os
 
 from devil.android import device_utils
@@ skipping 13 matching lines @@
 DEPS_EXCLUSION_LIST = []
 
 # TODO(mikecase): Remove this function and the constant DEVICE_DATA_DIR
 # once all data deps are pushed to the same location on the device.
 def _PushExtraSuiteDataDeps(device, test_apk):
   """Pushes some extra data files/dirs needed by some test suite.
 
   Args:
     test_apk: The test suite basename for which to return file paths.
   """
-  if test_apk in ['ChromeTest', 'ContentShellTest']:
+  if test_apk in ['ChromeTest', 'ContentShellTest', 'CronetTestInstrumentation']:

[pauljensen, 2015/10/09 20:58:10]

line wrap

[xunjieli, 2015/10/09 21:19:57]

Done.

     test_files = 'net/data/ssl/certificates'
     host_device_file_tuple = [
         (os.path.join(constants.DIR_SOURCE_ROOT, test_files),
          os.path.join(device.GetExternalStoragePath(), test_files))]
     device.PushChangedFiles(host_device_file_tuple)
 
 
 # TODO(mikecase): Remove this function once everything uses
 # base_setup.PushDataDeps to push data deps to the device.
 def _PushDataDeps(device, test_options):
@@ skipping 57 matching lines @@
       isolator.Clear()
 
   device_utils.DeviceUtils.parallel(devices).pMap(
       _PushExtraSuiteDataDeps, test_options.test_apk)
 
   def TestRunnerFactory(device, shard_index):
     return test_runner.TestRunner(test_options, device, shard_index,
                                   test_pkg)
 
   return (TestRunnerFactory, tests)