Devtools: refactor shell configuration logic.

mojo/devtools/common/mojo_test

 #!/usr/bin/env python
 # Copyright 2015 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.
 
 """Test runner for Mojo application tests.
 
 TODO(vtl|msw): Add a way of specifying data dependencies.
 """
 
 import argparse
 import logging
 import sys
 
 from devtoolslib import apptest_dart
 from devtoolslib import apptest_gtest
 from devtoolslib import shell_arguments
+from devtoolslib import shell_config
 
 _DESCRIPTION = """Runner for Mojo application tests.
 
 |test_list_file| has to be a valid Python program that sets a |tests| global
 variable, containing entries of the following form:
 
  {
    # Required URL for apptest.
    "test": "mojo:test_app_url",
    # Optional display name (otherwise the entry for "test" above is used).
@@ skipping 20 matching lines @@
 
 _logger = logging.getLogger()
 
 
 def main():
   parser = argparse.ArgumentParser(
       formatter_class=argparse.RawDescriptionHelpFormatter,
       description=_DESCRIPTION)
   parser.add_argument("test_list_file", type=file,
                       help="a file listing apptests to run")
+  shell_config.add_shell_arguments(parser)
 
-  # Common shell configuration arguments.
-  shell_arguments.add_shell_arguments(parser)
-  script_args, common_shell_args = parser.parse_known_args()
+  script_args, shell_args = parser.parse_known_args()
+  config = shell_config.get_shell_config(script_args)
 
   try:
-    shell, common_shell_args = shell_arguments.configure_shell(
-        script_args, common_shell_args)
+    shell, common_shell_args = shell_arguments.get_shell(config, shell_args)
   except shell_arguments.ShellConfigurationException as e:
     print e
     return 1
 
   target_os = "android" if script_args.android else "linux"
   test_list_globals = {"target_os": target_os}
   exec script_args.test_list_file in test_list_globals
   test_list = test_list_globals["tests"]
 
   succeeded = True
@@ skipping 25 matching lines @@
       print "Unrecognized test type in %r" % test_dict
 
     print "Succeeded" if apptest_result else "Failed"
     _logger.info("Completed: %s" % test_name)
     if not apptest_result:
       succeeded = False
   return 0 if succeeded else 1
 
 if __name__ == '__main__':
   sys.exit(main())