Revert 210035 "Creates a new test running script test_runner.py"

trunk/src/build/android/run_browser_tests.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 content_browsertests."""
+"""Runs content browser tests."""
 
-import logging
-import os
+import optparse
 import sys
 
-from pylib import cmd_helper
+from pylib.browsertests import dispatch
+from pylib.utils import run_tests_helper
+from pylib.utils import test_options_parser
+
+def main(argv):
+  option_parser = optparse.OptionParser()
+  test_options_parser.AddGTestOptions(option_parser)
+  options, args = option_parser.parse_args(argv)
+
+  if len(args) > 1:
+    option_parser.error('Unknown argument: %s' % args[1:])
+
+  run_tests_helper.SetLogLevel(options.verbose_count)
+  return dispatch.Dispatch(options)
 
 
 if __name__ == '__main__':
-  args = ['python',
-          os.path.join(os.path.dirname(__file__), 'test_runner.py'),
-          'content_browsertests'] + sys.argv[1:]
-  logging.warning('*' * 80)
-  logging.warning('This script is deprecated and will be removed soon.')
-  logging.warning('Use the following instead: %s', ' '.join(args))
-  logging.warning('*' * 80)
-  sys.exit(cmd_helper.RunCmd(args))
+  sys.exit(main(sys.argv))