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

mojo/devtools/common/devtoolslib/android_shell.py

 # 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 atexit
 import hashlib
 import json
 import logging
 import os
 import os.path
@@ skipping 17 matching lines @@
     'MojoShellApplication',
 ]
 
 # Tags used by native logging reflected in the logcat.
 _LOGCAT_NATIVE_TAGS = [
     'chromium',
 ]
 
 _MOJO_SHELL_PACKAGE_NAME = 'org.chromium.mojo.shell'
 
-_DEFAULT_BASE_PORT = 31337
 
 _logger = logging.getLogger()
 
 
 def _ExitIfNeeded(process):
   """Exits |process| if it is still alive."""
   if process.poll() is None:
     process.kill()
 
 
@@ skipping 132 matching lines @@
         fp.write(apk_sha1)
         fp.flush()
         subprocess.check_call(self._CreateADBCommand(['push', fp.name,
                                                       device_sha1_path]),
                               stdout=self.verbose_pipe)
     else:
       # To ensure predictable state after running InstallApk(), we need to stop
       # the shell here, as this is what "adb install" implicitly does.
       self.StopShell()
 
-  def SetUpLocalOrigin(self, local_dir, fixed_port=True):
-    """Sets up a local http server to serve files in |local_dir| along with
-    device port forwarding. Returns the origin flag to be set when running the
-    shell.
-    """
-
-    origin_url = self.ServeLocalDirectory(
-        local_dir, _DEFAULT_BASE_PORT if fixed_port else 0)
-    return "--origin=" + origin_url
-
   def ServeLocalDirectory(self, local_dir_path, port=0):
     """Serves the content of the local (host) directory, making it available to
     the shell under the url returned by the function.
 
     The server will run on a separate thread until the program terminates. The
     call returns immediately.
 
     Args:
       local_dir_path: path to the directory to be served
       port: port at which the server will be available to the shell
@@ skipping 26 matching lines @@
     def _UnmapPort():
       subprocess.Popen(unmap_command)
     atexit.register(_UnmapPort)
 
   def StartShell(self,
                  arguments,
                  stdout=None,
                  on_application_stop=None):
     """Starts the mojo shell, passing it the given arguments.
 
-    The |arguments| list must contain the "--origin=" arg. SetUpLocalOrigin()
-    can be used to set up a local directory on the host machine as origin.
-    If |stdout| is not None, it should be a valid argument for subprocess.Popen.
+    Args:
+      arguments: List of arguments for the shell. It must contain the
+          "--origin=" arg.  shell_arguments.ConfigureLocalOrigin() can be used
+          to set up a local directory on the host machine as origin.
+      stdout: Valid argument for subprocess.Popen() or None.
     """
     if not self.stop_shell_registered:
       atexit.register(self.StopShell)
       self.stop_shell_registered = True
 
     STDOUT_PIPE = "/data/data/%s/stdout.fifo" % _MOJO_SHELL_PACKAGE_NAME
 
     cmd = self._CreateADBCommand([
            'shell',
            'am',
@@ skipping 80 matching lines @@
       tags.extend(_LOGCAT_NATIVE_TAGS)
     if self.additional_logcat_tags is not None:
       tags.extend(self.additional_logcat_tags.split(","))
     logcat = subprocess.Popen(
         self._CreateADBCommand(['logcat',
                                 '-s',
                                 ' '.join(tags)]),
         stdout=sys.stdout)
     atexit.register(_ExitIfNeeded, logcat)
     return logcat