Revert of Simplify mojo_shell since it's now only used for Mandoline.

mojo/services/html_viewer/html_viewer.cc

 // 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.
 
 #include "base/command_line.h"
 #include "base/i18n/icu_util.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
@@ skipping 26 matching lines @@
 using mojo::InterfaceRequest;
 using mojo::ServiceProvider;
 using mojo::ServiceProviderPtr;
 using mojo::ShellPtr;
 using mojo::String;
 using mojo::URLLoaderPtr;
 using mojo::URLResponsePtr;
 
 namespace html_viewer {
 
-// Switches for html_viewer.
+// Switches for html_viewer to be used with "--args-for". For example:
+// --args-for='mojo:html_viewer --enable-mojo-media-renderer'
 
 // Enable MediaRenderer in media pipeline instead of using the internal
 // media::Renderer implementation.
 const char kEnableMojoMediaRenderer[] = "enable-mojo-media-renderer";
 
 // Disables support for (unprefixed) Encrypted Media Extensions.
 const char kDisableEncryptedMedia[] = "disable-encrypted-media";
 
 // Prevents creation of any output surface.
 const char kIsHeadless[] = "is-headless";
@@ skipping 117 matching lines @@
     blink_platform_.reset(new MojoBlinkPlatformImpl(app));
 #if defined(V8_USE_EXTERNAL_STARTUP_DATA)
     // Note: this requires file system access.
     gin::V8Initializer::LoadV8Snapshot();
 #endif
     blink::initialize(blink_platform_.get());
     base::i18n::InitializeICU();
 
     ui::RegisterPathProvider();
 
+    base::CommandLine::StringVector command_line_args;
+#if defined(OS_WIN)
+    for (const auto& arg : app->args())
+      command_line_args.push_back(base::UTF8ToUTF16(arg));
+#elif defined(OS_POSIX)
+    command_line_args = app->args();
+#endif
+
     base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+    command_line->InitFromArgv(command_line_args);
 
     logging::LoggingSettings settings;
     settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
     logging::InitLogging(settings);
     // Display process ID, thread ID and timestamp in logs.
     logging::SetLogItems(true, true, true, false);
 
     if (command_line->HasSwitch(kDisableEncryptedMedia))
       blink::WebRuntimeFeatures::enableEncryptedMedia(false);
 
@@ skipping 49 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(HTMLViewer);
 };
 
 }  // namespace html_viewer
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(new html_viewer::HTMLViewer);
   return runner.Run(shell_handle);
 }