[Android] Remove --test-arguments arg from test_runner.py.

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 66 matching lines @@
   return parser
 
 
 def AddCommandLineOptions(parser):
   """Adds arguments to support passing command-line flags to the device."""
   parser.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): This is deprecated. Remove once clients have switched
-  # to passing command-line flags directly.
-  parser.add_argument(
-      '-a', '--test-arguments',
-      dest='test_arguments', default='',
-      help=argparse.SUPPRESS)
   parser.set_defaults(allow_unknown=True)
   parser.set_defaults(command_line_flags=None)
 
 
 def AddTracingOptions(parser):
   # TODO(shenghuazhang): Move this into AddCommonOptions once it's supported
   # for all test types.
   parser.add_argument(
       '--trace-output',
       metavar='FILENAME', type=os.path.realpath,
@@ skipping 317 matching lines @@
       '--test-apk',
       required=True,
       help='Path or name of the apk containing the tests.')
   parser.add_argument(
       '--test-jar',
       help='Path of jar containing test java files.')
   parser.add_argument(
       '--timeout-scale',
       type=float,
       help='Factor by which timeouts should be scaled.')
-  parser.add_argument(
-      '-w', '--wait_debugger',
-      action='store_true', dest='wait_for_debugger',
-      help='Wait for debugger.')
 
   # These arguments are suppressed from the help text because they should
   # only ever be specified by an intermediate script.
   parser.add_argument(
       '--apk-under-test-incremental-install-script',
       help=argparse.SUPPRESS)
   parser.add_argument(
       '--test-apk-incremental-install-script',
       type=os.path.realpath,
       help=argparse.SUPPRESS)
@@ skipping 472 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())