Move debug-related stuff from base to the base/debug directory and use the...

base/debug_on_start.cc

 // Copyright (c) 2006-2008 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 <windows.h>
 
 #include "base/debug_on_start.h"
 
 #include "base/base_switches.h"
 #include "base/basictypes.h"
-#include "base/debug_util.h"
+#include "base/debug/debugger.h"
 
 // Minimalist implementation to try to find a command line argument. We can use
 // kernel32 exported functions but not the CRT functions because we're too early
 // in the process startup.
 // The code is not that bright and will find things like ---argument or
 // /-/argument.
 // Note: command_line is non-destructively modified.
 bool DebugOnStart::FindArgument(wchar_t* command_line, const char* argument_c) {
   wchar_t argument[50];
   for (int i = 0; argument_c[i]; ++i)
@@ skipping 27 matching lines @@
 // static
 int __cdecl DebugOnStart::Init() {
   // Try to find the argument.
   if (FindArgument(GetCommandLine(), switches::kDebugOnStart)) {
     // We can do 2 things here:
     // - Ask for a debugger to attach to us. This involve reading the registry
     //   key and creating the process.
     // - Do a int3.
 
     // It will fails if we run in a sandbox. That is expected.
-    DebugUtil::SpawnDebuggerOnProcess(GetCurrentProcessId());
+    base::debug::SpawnDebuggerOnProcess(GetCurrentProcessId());
 
     // Wait for a debugger to come take us.
-    DebugUtil::WaitForDebugger(60, false);
+    base::debug::WaitForDebugger(60, false);
   } else if (FindArgument(GetCommandLine(), switches::kWaitForDebugger)) {
     // Wait for a debugger to come take us.
-    DebugUtil::WaitForDebugger(60, true);
+    base::debug::WaitForDebugger(60, true);
   }
   return 0;
 }