Replace ChildProcess/AppChildProcess with a simple ChildMain().

shell/desktop/main.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 <stdio.h>
 #include <string.h>
 
 #include <algorithm>
 #include <iostream>
 
 #include "base/at_exit.h"
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/trace_event/trace_event.h"
-#include "shell/child_process.h"
+#include "shell/child_main.h"
 #include "shell/command_line_util.h"
 #include "shell/context.h"
 #include "shell/init.h"
 #include "shell/switches.h"
 
 namespace {
 
 void Usage() {
   std::cerr << "Launch Mojo applications.\n";
   std::cerr
@@ skipping 72 matching lines @@
 }
 
 }  // namespace
 
 int main(int argc, char** argv) {
   base::AtExitManager at_exit;
   base::CommandLine::Init(argc, argv);
 
   mojo::shell::InitializeLogging();
 
+  const base::CommandLine& command_line =
+      *base::CommandLine::ForCurrentProcess();
+
   // TODO(vtl): Unify parent and child process cases to the extent possible.
-  if (scoped_ptr<mojo::shell::ChildProcess> child_process =
-          mojo::shell::ChildProcess::Create(
-              *base::CommandLine::ForCurrentProcess())) {
-    child_process->Main();
+  int exit_code = 0;
+  if (command_line.HasSwitch(switches::kChildProcess)) {
+    exit_code = mojo::shell::ChildMain();
   } else {
     // Only check the command line for the main process.
-    const base::CommandLine& command_line =
-        *base::CommandLine::ForCurrentProcess();
-
     const std::set<std::string> all_switches = switches::GetAllSwitches();
     const base::CommandLine::SwitchMap switches = command_line.GetSwitches();
     bool found_unknown_switch = false;
     for (const auto& s : switches) {
       if (all_switches.find(s.first) == all_switches.end()) {
         std::cerr << "unknown switch: " << s.first << std::endl;
         found_unknown_switch = true;
       }
     }
 
@@ skipping 42 matching lines @@
           base::Bind(&mojo::shell::RunCommandLineApps, &shell_context));
       message_loop.Run();
 
       // Must be called before |message_loop| is destroyed.
       shell_context.Shutdown();
     }
   }
 
   if (g_tracing)
     StopTracingAndFlushToDisk();
-  return 0;
+  return exit_code;
 }