Move a bunch of child-only code from content/common to content/child

content/browser/browser_main_runner.cc

 // Copyright (c) 2012 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/public/browser/browser_main_runner.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 "base/metrics/statistics_recorder.h"
 #include "content/browser/browser_main_loop.h"
 #include "content/browser/notification_service_impl.h"
-#include "content/common/child_process.h"
+#include "content/common/debug_util.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 
 #if defined(OS_WIN)
 #include "base/win/metro.h"
 #include "base/win/windows_version.h"
+#include "ui/base/ime/win/tsf_bridge.h"
 #include "ui/base/win/scoped_ole_initializer.h"
-#include "ui/base/ime/win/tsf_bridge.h"
 #endif
 
 bool g_exited_main_message_loop = false;
 
 namespace content {
 
 class BrowserMainRunnerImpl : public BrowserMainRunner {
  public:
   BrowserMainRunnerImpl()
       : is_initialized_(false),
         is_shutdown_(false),
         created_threads_(false) {
   }
 
   virtual ~BrowserMainRunnerImpl() {
     if (is_initialized_ && !is_shutdown_)
       Shutdown();
   }
 
   virtual int Initialize(const MainFunctionParams& parameters)
       OVERRIDE {
     TRACE_EVENT0("startup", "BrowserMainRunnerImpl::Initialize")
     is_initialized_ = true;
 
 #if !defined(OS_IOS)
-    // ChildProcess:: is a misnomer unless you consider context.  Use
-    // of --wait-for-debugger only makes sense when Chrome itself is a
+    // 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");
+      WaitForDebugger("Browser");

[jam, 2013/06/05 16:54:58]

actually, you can take out this whole section. this code got added for pyauto
which has been deprecated for a long time, and since devs don't use it, no need
to support this debugging option.

[scottmg, 2013/06/05 17:19:27]

Done.

 #endif  // !defined(OS_IOS)
 
 #if defined(OS_WIN)
     if (parameters.command_line.HasSwitch(
             switches::kEnableTextServicesFramework)) {
       base::win::SetForceToUseTSF();
     } else if (base::win::GetVersion() < base::win::VERSION_VISTA) {
       // When "Extend support of advanced text services to all programs"
       // (a.k.a. Cicero Unaware Application Support; CUAS) is enabled on
       // Windows XP and handwriting modules shipped with Office 2003 are
@@ skipping 100 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(BrowserMainRunnerImpl);
 };
 
 // static
 BrowserMainRunner* BrowserMainRunner::Create() {
   return new BrowserMainRunnerImpl();
 }
 
 }  // namespace content