Shell: Make a separate binary for child processes.

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 218 matching lines @@
 
 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() {
-  TRACE_EVENT0("mojo_shell", "Context::Init");
+  base::FilePath shell_path = base::MakeAbsoluteFilePath(
+      base::CommandLine::ForCurrentProcess()->GetProgram());
+  base::FilePath shell_child_path =
+      shell_path.DirName().AppendASCII("mojo_shell_child");
+  return InitWithPaths(shell_path, shell_child_path);
+}
+
+bool Context::InitWithPaths(const base::FilePath& shell_path,
+                            const base::FilePath& shell_child_path) {
+  TRACE_EVENT0("mojo_shell", "Context::InitWithPaths");
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
 
   if (command_line.HasSwitch(switches::kWaitForDebugger))
     base::debug::WaitForDebugger(60, true);
 
-  mojo_shell_path_ = base::MakeAbsoluteFilePath(command_line.GetProgram());
-  // TODO(vtl): For the moment, the child is the same as the parent.
-  mojo_shell_child_path_ = mojo_shell_path_;
+  mojo_shell_path_ = shell_path;
+  mojo_shell_child_path_ = shell_child_path;
 
   EnsureEmbedderIsInitialized();
   task_runners_.reset(
       new TaskRunners(base::MessageLoop::current()->message_loop_proxy()));
 
   // TODO(vtl): Probably these failures should be checked before |Init()|, and
   // this function simply shouldn't fail.
   if (!shell_file_root_.is_valid())
     return false;
   if (!ConfigureURLMappings(command_line, this))
@@ skipping 84 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