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

mojo/tools/apptest_runner.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.
 
-"""A test runner for gtest application tests."""
+"""A test runner for application tests."""
 
 import argparse
 import logging
 import sys
 
 import devtools
 devtools.add_lib_to_path()
 from devtoolslib.android_shell import AndroidShell
 from devtoolslib.linux_shell import LinuxShell
 from devtoolslib.apptest_runner import run_apptests
+from devtoolslib import shell_arguments
 
 from mopy import gtest
 from mopy.config import Config
 from mopy.gn import ConfigForGNArgs, ParseGNConfig
 from mopy.log import InitLogging
 from mopy.paths import Paths
 
 
 _logger = logging.getLogger()
 
@@ skipping 10 matching lines @@
                       help="the build output directory")
   args = parser.parse_args()
 
   InitLogging(args.verbose_count)
   config = ConfigForGNArgs(ParseGNConfig(args.build_dir))
   paths = Paths(config)
   extra_args = []
   if config.target_os == Config.OS_ANDROID:
     shell = AndroidShell(paths.adb_path)
     shell.InstallApk(paths.target_mojo_shell_path)
-    extra_args.append(shell.SetUpLocalOrigin(paths.build_dir, fixed_port=False))
+    extra_args.extend(shell_arguments.ConfigureLocalOrigin(
+        shell, paths.build_dir, fixed_port=False))
   else:
     shell = LinuxShell(paths.mojo_shell_path)
 
   gtest.set_color()
 
   test_list_globals = {"config": config}
   exec args.test_list_file in test_list_globals
   apptests_result = run_apptests(shell, extra_args, test_list_globals["tests"])
   return 0 if apptests_result else 1
 
 
 if __name__ == '__main__':
   sys.exit(main())