Process --map-origin and --map-url flags regardless of the platform.

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
@@ skipping 46 matching lines @@
                      '"<url>=<url-or-local-path>"')
   if _is_web_url(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 _apply_appings(shell, original_arguments, map_urls, map_origins):
+def _apply_mappings(shell, original_arguments, map_urls, map_origins):
   """Applies mappings for specified urls and origins. For each local path
   specified as destination a local server will be spawned and the mapping will
   be rewritten accordingly.
 
   Args:
     shell: The shell that is being configured.
     original_arguments: Current list of shell arguments.
     map_urls: List of url mappings, each in the form of
       <url>=<url-or-local-path>.
     map_origins: List of origin mappings, each in the form of
@@ skipping 170 matching lines @@
     verbose_pipe = sys.stdout if config_args.verbose else None
 
     shell = AndroidShell(config_args.adb_path, config_args.target_device,
                          logcat_tags=config_args.logcat_tags,
                          verbose_pipe=verbose_pipe)
     device_status, error = shell.CheckDevice()
     if not device_status:
       raise ShellConfigurationException('Device check failed: ' + error)
     if config_args.shell_path:
       shell.InstallApk(config_args.shell_path)
-
-    shell_args = _apply_appings(shell, shell_args, config_args.map_url,
-                                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')
 
+  shell_args = _apply_mappings(shell, shell_args, config_args.map_url,
+                               config_args.map_origin)
+
   if config_args.origin:
     if _is_web_url(config_args.origin):
       shell_args.append('--origin=' + config_args.origin)
     else:
       shell_args.extend(configure_local_origin(shell, config_args.origin,
                                              fixed_port=True))
 
   return shell, shell_args