Separate mojo/shell into a runner and the application manager (shell)

mojo/shell/switches.cc

Index: mojo/shell/switches.cc
diff --git a/mojo/shell/switches.cc b/mojo/shell/switches.cc
index e5c9d346c9bcb4c3c3ed1940266be011149159f6..c6df370e7a2a78d9b000ce1f00bd15d6c6589979 100644
--- a/mojo/shell/switches.cc
+++ b/mojo/shell/switches.cc
@@ -8,46 +8,9 @@
 
 namespace switches {
 
-// Used just for debugging to make it easier to attach debuggers. The actual app
-// path that is used is sent over IPC.
-const char kApp[] = "app";
-
-// Used internally by the main process to indicate that a new process should be
-// a child process. Not for user use.
-const char kChildProcess[] = "child-process";
-
-// Comma separated list like:
-// text/html,mojo:html_viewer,application/bravo,https://abarth.com/bravo
-const char kContentHandlers[] = "content-handlers";
-
-// Force dynamically loaded apps / services to be loaded irrespective of cache
-// instructions.
-const char kDisableCache[] = "disable-cache";
-
 // If set apps downloaded are not deleted.
 const char kDontDeleteOnDownload[] = "dont-delete-on-download";
 
-// Load apps in separate processes.
-// TODO(vtl): Work in progress; doesn't work. Flip this to "disable" (or maybe
-// change it to "single-process") when it works.
-const char kEnableMultiprocess[] = "enable-multiprocess";
-
-// In multiprocess mode, force these apps to be loaded in the main process.
-// Comma-separate list of URLs. Example:
-// --force-in-process=mojo:native_viewport_service,mojo:network_service
-const char kForceInProcess[] = "force-in-process";
-
-// Print the usage message and exit.
-const char kHelp[] = "help";
-
-// Specify origin to map to base url. See url_resolver.cc for details.
-// Can be used multiple times.
-const char kMapOrigin[] = "map-origin";
-
-// Map mojo: URLs to a shared library of similar name at this origin. See
-// url_resolver.cc for details.
-const char kOrigin[] = "origin";
-
 // If set apps downloaded are saved in with a predictable filename, to help
 // remote debugging: when gdb is used through gdbserver, it needs to be able to
 // find locally any loaded library. For this, gdb use the filename of the
@@ -55,14 +18,4 @@ const char kOrigin[] = "origin";
 // their content.
 const char kPredictableAppFilenames[] = "predictable-app-filenames";
 
-// Starts tracing when the shell starts up, saving a trace file on disk after 5
-// seconds or when the shell exits.
-const char kTraceStartup[] = "trace-startup";
-
-// Specifies a set of mappings to apply when resolving urls. The value is a set
-// of ',' separated mappings, where each mapping consists of a pair of urls
-// giving the to/from url to map. For example, 'a=b,c=d' contains two mappings,
-// the first maps 'a' to 'b' and the second 'c' to 'd'.
-const char kURLMappings[] = "url-mappings";
-
 }  // namespace switches