Revert of [android] Stop using isolate.py for data dependency management.

build/android/test_runner.py

 #!/usr/bin/env python
 #
 # 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.
 
 """Runs all types of tests from one unified interface."""
 
 import argparse
 import collections
@@ skipping 178 matching lines @@
                      '--gtest-also-run-disabled-tests',
                      dest='run_disabled', action='store_true',
                      help='Also run disabled tests if applicable.')
   group.add_argument('-a', '--test-arguments', dest='test_arguments',
                      default='',
                      help='Additional arguments to pass to the test.')
   group.add_argument('-t', '--shard-timeout',
                      dest='shard_timeout', type=int, default=120,
                      help='Timeout to wait for each test '
                           '(default: %(default)s).')
-  # TODO(jbudorick): Remove this after ensuring nothing else uses it.
   group.add_argument('--isolate_file_path',
                      '--isolate-file-path',
                      dest='isolate_file_path',
                      type=os.path.realpath,
-                     help=argparse.SUPPRESS)
-  group.add_argument('--runtime-deps-path',
-                     dest='runtime_deps_path',
-                     type=os.path.realpath,
-                     help='Runtime data dependency file from GN.')
+                     help='.isolate file path to override the default '
+                          'path')
   group.add_argument('--app-data-file', action='append', dest='app_data_files',
                      help='A file path relative to the app data directory '
                           'that should be saved to the host.')
   group.add_argument('--app-data-file-dir',
                      help='Host directory to which app data files will be'
                           ' saved. Used with --app-data-file.')
   group.add_argument('--delete-stale-data', dest='delete_stale_data',
                      action='store_true',
                      help='Delete stale test data on the device.')
   group.add_argument('--repeat', '--gtest_repeat', '--gtest-repeat',
@@ skipping 138 matching lines @@
   group.add_argument('--coverage-dir', type=os.path.realpath,
                      help=('Directory in which to place all generated '
                            'EMMA coverage files.'))
   group.add_argument('--device-flags', dest='device_flags',
                      type=os.path.realpath,
                      help='The relative filepath to a file containing '
                           'command-line flags to set on the device')
   group.add_argument('--device-flags-file', type=os.path.realpath,
                      help='The relative filepath to a file containing '
                           'command-line flags to set on the device')
-  # TODO(jbudorick): Remove this after ensuring nothing else uses it.
   group.add_argument('--isolate_file_path',
                      '--isolate-file-path',
                      dest='isolate_file_path',
                      type=os.path.realpath,
-                     help=argparse.SUPPRESS)
-  group.add_argument('--runtime-deps-path',
-                     dest='runtime_deps_path',
-                     type=os.path.realpath,
-                     help='Runtime data dependency file from GN.')
+                     help='.isolate file path to override the default '
+                          'path')
   group.add_argument('--delete-stale-data', dest='delete_stale_data',
                      action='store_true',
                      help='Delete stale test data on the device.')
   group.add_argument('--timeout-scale', type=float,
                      help='Factor by which timeouts should be scaled.')
   group.add_argument('--strict-mode', dest='strict_mode', default='testing',
                      help='StrictMode command-line flag set on the device, '
                           'death/testing to kill the process, off to stop '
                           'checking, flash to flash only. Default testing.')
   group.add_argument('--regenerate-goldens', dest='regenerate_goldens',
@@ skipping 458 matching lines @@
     if e.is_infra_error:
       return constants.INFRA_EXIT_CODE
     return constants.ERROR_EXIT_CODE
   except: # pylint: disable=W0702
     logging.exception('Unrecognized error occurred.')
     return constants.ERROR_EXIT_CODE
 
 
 if __name__ == '__main__':
   sys.exit(main())