Upstream changes to python tests.

build/android/run_instrumentation_tests.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012 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 both the Python and Java tests."""
 
+import optparse
 import sys
 import time
 
 from pylib import apk_info
 from pylib import buildbot_report
 from pylib import test_options_parser
 from pylib import run_java_tests
 from pylib import run_python_tests
 from pylib import run_tests_helper
 from pylib.test_result import TestResults
@@ skipping 43 matching lines @@
         [apk_info.ApkInfo(options.test_apk_path, options.test_apk_jar_path)])
   if options.run_python_tests:
     python_results = run_python_tests.DispatchPythonTests(options)
 
   all_results, summary_string, num_failing = SummarizeResults(
       java_results, python_results, options.annotation, options.build_type)
   return num_failing
 
 
 def main(argv):
-  options = test_options_parser.ParseInstrumentationArgs(argv)
+  option_parser = optparse.OptionParser()
+  test_options_parser.AddInstrumentationOptions(option_parser)
+  options, args = option_parser.parse_args(argv)
+  test_options_parser.ValidateInstrumentationOptions(options, args)
+
   run_tests_helper.SetLogLevel(options.verbose_count)
   buildbot_report.PrintNamedStep('Instrumentation tests: %s'
                                  % ', '.join(options.annotation))
   return DispatchInstrumentationTests(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))