Merge --origin and --origin-path in devtools scripts.

mojo/devtools/common/devtoolslib/shell_arguments.py

 # 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.
 
 """Functions that configure the shell before it is run manipulating its argument
 list.
 """
 
 import os.path
 import sys
 import urlparse
 
 from devtoolslib.android_shell import AndroidShell
 from devtoolslib.linux_shell import LinuxShell
 
 # When spinning up servers for local origins, we want to use predictable ports
 # so that caching works between subsequent runs with the same command line.
 _LOCAL_ORIGIN_PORT = 31840
 _MAPPINGS_BASE_PORT = 31841
 
 _SKY_SERVER_PORT = 9998
 
 
+def _IsWebUrl(dest):
+  return True if urlparse.urlparse(dest).scheme else False
+
+
 def _HostLocalUrlDestination(shell, dest_file, port):
   """Starts a local server to host |dest_file|.
 
   Returns:
     Url of the hosted file.
   """
   directory = os.path.dirname(dest_file)
   if not os.path.exists(directory):
     raise ValueError('local path passed as --map-url destination '
                      'does not exist')
@@ skipping 11 matching lines @@
 
 
 def _Rewrite(mapping, host_destination_functon, shell, port):
   """Takes a mapping given as <src>=<dest> and rewrites the <dest> part to be
   hosted locally using the given function if <dest> is not a web url.
   """
   parts = mapping.split('=')
   if len(parts) != 2:
     raise ValueError('each mapping value should be in format '
                      '"<url>=<url-or-local-path>"')
-  if urlparse.urlparse(parts[1])[0]:
+  if _IsWebUrl(parts[1]):
     # The destination is a web url, do nothing.
     return mapping
 
   src = parts[0]
   dest = host_destination_functon(shell, parts[1], port)
   return src + '=' + dest
 
 
 def _ApplyMappings(shell, original_arguments, map_urls, map_origins):
   """Applies mappings for specified urls and origins. For each local path
@@ skipping 115 matching lines @@
   return arguments
 
 
 def AddShellArguments(parser):
   """Adds argparse arguments allowing to configure shell abstraction using
   ConfigureShell() below.
   """
   # Arguments indicating paths to binaries and tools.
   parser.add_argument('--adb-path', help='Path of the adb binary.')
   parser.add_argument('--shell-path', help='Path of the Mojo shell binary.')
-  parser.add_argument('--origin-path', help='Path of a directory to be set as '
-                      'the origin for mojo: urls')
 
   # Arguments configuring the shell run.
   parser.add_argument('--android', help='Run on Android',
                       action='store_true')
-  parser.add_argument('--origin', help='Origin for mojo: URLs.')
+  parser.add_argument('--origin', help='Origin for mojo: URLs. This can be a '
+                      'web url or a local directory path.')
   parser.add_argument('--map-url', action='append',
                       help='Define a mapping for a url in the format '
                       '<url>=<url-or-local-file-path>')
   parser.add_argument('--map-origin', action='append',
                       help='Define a mapping for a url origin in the format '
                       '<origin>=<url-or-local-file-path>')
 
   # Android-only arguments.
   parser.add_argument('--target-device',
                       help='(android-only) Device to run on.')
@@ skipping 50 matching lines @@
                                 config_args.map_origin)
   else:
     if not config_args.shell_path:
       raise ShellConfigurationException('Can not run without a shell binary. '
                                         'Please pass --shell-path.')
     shell = LinuxShell(config_args.shell_path)
     if config_args.use_osmesa:
       shell_args.append('--args-for=mojo:native_viewport_service --use-osmesa')
 
   if config_args.origin:
-    shell_args.append('--origin=' + config_args.origin)
-  elif config_args.origin_path:
-    shell_args.extend(ConfigureLocalOrigin(shell, config_args.origin_path,
-                                           fixed_port=True))
+    if _IsWebUrl(config_args.origin):
+      shell_args.append('--origin=' + config_args.origin)
+    else:
+      shell_args.extend(ConfigureLocalOrigin(shell, config_args.origin,
+                                             fixed_port=True))
 
   return shell, shell_args