Resolve URLs passed on the command line relative to the CWD.

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 "shell/context.h"
 
 #include <vector>
 
 #include "base/base_switches.h"
 #include "base/bind.h"
@@ skipping 119 matching lines @@
   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(pair.second);
+      const GURL to = context->ResolveCommandLineURL(pair.second);
       if (!from.is_valid() || !to.is_valid())
         return false;
       resolver->AddCustomMapping(from, to);
     }
   }
   return true;
 }
 
 }  // namespace
 
 Context::Context() : application_manager_(this) {
   DCHECK(!base::MessageLoop::current());
 
   // By default assume that the local apps reside alongside the shell.
   // TODO(ncbray): really, this should be passed in rather than defaulting.
   // This default makes sense for desktop but not Android.
   base::FilePath shell_dir;
   PathService::Get(base::DIR_MODULE, &shell_dir);
   SetShellFileRoot(shell_dir);
+
+  base::FilePath cwd;
+  PathService::Get(base::DIR_CURRENT, &cwd);
+  SetCommandLineCWD(cwd);
 }
 
 Context::~Context() {
   DCHECK(!base::MessageLoop::current());
 }
 
 void Context::EnsureEmbedderIsInitialized() {
   setup.Get();
 }
 
 void Context::SetShellFileRoot(const base::FilePath& path) {
   shell_file_root_ = AddTrailingSlashIfNeeded(FilePathToFileURL(path));
 }
 
 GURL Context::ResolveShellFileURL(const std::string& path) {
   return shell_file_root_.Resolve(path);
 }
 
+void Context::SetCommandLineCWD(const base::FilePath& path) {
+  command_line_cwd_ = AddTrailingSlashIfNeeded(FilePathToFileURL(path));
+}
+
+GURL Context::ResolveCommandLineURL(const std::string& path) {
+  return command_line_cwd_.Resolve(path);
+}
+
 bool Context::Init() {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
 
   if (command_line->HasSwitch(switches::kWaitForDebugger))
     base::debug::WaitForDebugger(60, true);
 
   EnsureEmbedderIsInitialized();
   task_runners_.reset(
       new TaskRunners(base::MessageLoop::current()->message_loop_proxy()));
 
@@ skipping 68 matching lines @@
 ScopedMessagePipeHandle Context::ConnectToServiceByName(
     const GURL& application_url,
     const std::string& service_name) {
   app_urls_.insert(application_url);
   return application_manager_.ConnectToServiceByName(application_url,
                                                      service_name).Pass();
 }
 
 }  // namespace shell
 }  // namespace mojo