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

mojo/shell/context.cc

 // Copyright 2013 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 "mojo/shell/context.h"
 
 #include <vector>
 
 #include "base/base_switches.h"
 #include "base/bind.h"
@@ skipping 12 matching lines @@
 #include "mojo/common/trace_controller_impl.h"
 #include "mojo/common/tracing_impl.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/simple_platform_support.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/services/tracing/tracing.mojom.h"
 #include "mojo/shell/application_manager/application_loader.h"
 #include "mojo/shell/application_manager/application_manager.h"
+#include "mojo/shell/command_line_util.h"
 #include "mojo/shell/filename_util.h"
 #include "mojo/shell/in_process_native_runner.h"
 #include "mojo/shell/out_of_process_native_runner.h"
 #include "mojo/shell/switches.h"
 #include "url/gurl.h"
 
 namespace mojo {
 namespace shell {
 namespace {
 
@@ skipping 34 matching lines @@
       GURL("mojo:network_service"),
       context->ResolveShellFileURL("file:network_service.mojo"));
 
   // Command line URL mapping.
   std::vector<URLResolver::OriginMapping> origin_mappings =
       URLResolver::GetOriginMappings(command_line.argv());
   for (const auto& origin_mapping : origin_mappings)
     resolver->AddOriginMapping(GURL(origin_mapping.origin),
                                GURL(origin_mapping.base_url));
 
+  if (command_line.HasSwitch(switches::kURLMappings)) {
+    const std::string mappings =
+        command_line.GetSwitchValueASCII(switches::kURLMappings);
+
+    base::StringPairs pairs;
+    if (!base::SplitStringIntoKeyValuePairs(mappings, '=', ',', &pairs))
+      return false;
+    using StringPair = std::pair<std::string, std::string>;
+    for (const StringPair& pair : pairs) {
+      const GURL from(pair.first);
+      const GURL to = context->ResolveCommandLineURL(pair.second);
+      if (!from.is_valid() || !to.is_valid())
+        return false;
+      resolver->AddURLMapping(from, to);
+    }
+  }
   return true;
 }
 
 void InitContentHandlers(ApplicationManager* manager,
                          const base::CommandLine& command_line) {
   // Default content handlers.
   manager->RegisterContentHandler("application/pdf", GURL("mojo:pdf_viewer"));
   manager->RegisterContentHandler("image/png", GURL("mojo:png_viewer"));
   manager->RegisterContentHandler("text/html", GURL("mojo:html_viewer"));
 
@@ skipping 205 matching lines @@
     if (app_urls_.empty() && base::MessageLoop::current()->is_running()) {
       DCHECK_EQ(base::MessageLoop::current()->task_runner(),
                 task_runners_->shell_runner());
       base::MessageLoop::current()->Quit();
     }
   }
 }
 
 }  // namespace shell
 }  // namespace mojo