Updated files

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 86 matching lines @@
   group.add_argument('-e', '--environment', default='local',
                      choices=constants.VALID_ENVIRONMENTS,
                      help='Test environment to run in (default: %(default)s).')
   group.add_argument('--adb-path', type=os.path.abspath,
                      help=('Specify the absolute path of the adb binary that '
                            'should be used.'))
   group.add_argument('--json-results-file', '--test-launcher-summary-output',
                      dest='json_results_file',
                      help='If set, will dump results in JSON form '
                           'to specified file.')
+  group.add_argument('--logdog_butler-dir',
+                     help='If set, contains the location of the logdog butler '
+                     'for streaming logcats')
+  group.add_argument('--logdog_butler-prefix',
+                     help='Must be set to use to use logdog butler.'
+                     'Contains the prefix to use for the logdog butler.')
+  group.add_argument('--logdog_butler-project',
+                     help='Must be set to use logdog butler.' 
+                     'Contains the project name for logdog butler.')
 
   logcat_output_group = group.add_mutually_exclusive_group()
   logcat_output_group.add_argument(
       '--logcat-output-dir',
       help='If set, will dump logcats recorded during test run to directory. '
            'File names will be the device ids with timestamps.')
   logcat_output_group.add_argument(
       '--logcat-output-file',
       help='If set, will merge logcats recorded during test run and dump them '
            'to the specified file.')
@@ skipping 864 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())