Move the logic to set up a local origin for shell run to shell_arguments.py.

mojo/tools/android_mojo_shell.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 import argparse
 import logging
 import sys
 
 import devtools
@@ skipping 46 matching lines @@
 
   config = Config(target_os=Config.OS_ANDROID,
                   target_cpu=launcher_args.target_cpu,
                   is_debug=launcher_args.debug)
   paths = Paths(config)
   verbose_pipe = sys.stdout if launcher_args.verbose else None
   shell = AndroidShell(paths.adb_path, launcher_args.target_device,
                        logcat_tags=launcher_args.logcat_tags,
                        verbose_pipe=verbose_pipe)
   shell.InstallApk(paths.target_mojo_shell_path)
-  args.append("--origin=" + launcher_args.origin if launcher_args.origin else
-              shell.SetUpLocalOrigin(paths.build_dir))
+
   args = shell_arguments.RewriteMapOriginParameters(shell, args)
+  if launcher_args.origin:
+    args.append("--origin=" + launcher_args.origin)
+  else:
+    args.extend(shell_arguments.ConfigureLocalOrigin(shell, paths.build_dir))
   if launcher_args.debugger:
     args.extend(shell_arguments.ConfigureDebugger(shell))
+
   shell.Run(args)
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(main())