Remove child_process.h includes from chrome (specifically WaitForDebugger). I moved the browser p...

content/browser/browser_main.cc

 // Copyright (c) 2011 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 "content/browser/browser_main.h"
 
 #include "base/allocator/allocator_shim.h"
+#include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "content/browser/browser_main_loop.h"
 #include "content/browser/notification_service_impl.h"
+#include "content/common/child_process.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 
 #if defined(OS_WIN)
 #include "base/win/scoped_com_initializer.h"
 #endif
 
 namespace {
 
 bool g_exited_main_message_loop = false;
 
 }  // namespace
 
 namespace content {
 
 bool ExitedMainMessageLoop() {
   return g_exited_main_message_loop;
 }
 
 }  // namespace content
 
 // Main routine for running as the Browser process.
 int BrowserMain(const content::MainFunctionParams& parameters) {
   TRACE_EVENT_BEGIN_ETW("BrowserMain", 0, "");
 
+  // ChildProcess:: is a misnomer unless you consider context.  Use
+  // of --wait-for-debugger only makes sense when Chrome itself is a
+  // child process (e.g. when launched by PyAuto).
+  if (parameters.command_line.HasSwitch(switches::kWaitForDebugger))
+    ChildProcess::WaitForDebugger("Browser");
+
   NotificationServiceImpl main_notification_service;
 
   scoped_ptr<content::BrowserMainLoop> main_loop(
       new content::BrowserMainLoop(parameters));
 
   main_loop->Init();
 
   main_loop->EarlyInitialization();
 
   // Must happen before we try to use a message loop or display any UI.
@@ skipping 39 matching lines @@
 #endif  // OS_WIN
 
   base::StatisticsRecorder statistics;
 
   main_loop->RunMainMessageLoopParts(&g_exited_main_message_loop);
 
   TRACE_EVENT_END_ETW("BrowserMain", 0, 0);
 
   return main_loop->GetResultCode();
 }