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

base/process_util_mac.mm

Index: base/process_util_mac.mm
===================================================================
--- base/process_util_mac.mm	(revision 63176)
+++ base/process_util_mac.mm	(working copy)
@@ -23,7 +23,7 @@
 #include <new>
 #include <string>
 
-#include "base/debug_util.h"
+#include "base/debug/debugger.h"
 #include "base/eintr_wrapper.h"
 #include "base/logging.h"
 #include "base/string_util.h"
@@ -166,7 +166,7 @@
 }
 
 bool NamedProcessIterator::IncludeEntry() {
-  return (base::SysWideToUTF8(executable_name_) == entry().exe_file() &&
+  return (SysWideToUTF8(executable_name_) == entry().exe_file() &&
           ProcessIterator::IncludeEntry());
 }
 
@@ -187,7 +187,7 @@
       last_time_(0),
       last_system_time_(0),
       port_provider_(port_provider) {
-  processor_count_ = base::SysInfo::NumberOfProcessors();
+  processor_count_ = SysInfo::NumberOfProcessors();
 }
 
 // static
@@ -402,7 +402,7 @@
                         size_t size) {
   void* result = g_old_malloc(zone, size);
   if (!result && size)
-    DebugUtil::BreakDebugger();
+    debugger::BreakDebugger();
   return result;
 }
 
@@ -411,7 +411,7 @@
                         size_t size) {
   void* result = g_old_calloc(zone, num_items, size);
   if (!result && num_items && size)
-    DebugUtil::BreakDebugger();
+    debugger::BreakDebugger();
   return result;
 }
 
@@ -419,7 +419,7 @@
                         size_t size) {
   void* result = g_old_valloc(zone, size);
   if (!result && size)
-    DebugUtil::BreakDebugger();
+    debugger::BreakDebugger();
   return result;
 }
 
@@ -428,7 +428,7 @@
                          size_t size) {
   void* result = g_old_realloc(zone, ptr, size);
   if (!result && size)
-    DebugUtil::BreakDebugger();
+    debugger::BreakDebugger();
   return result;
 }
 
@@ -441,7 +441,7 @@
   // http://opensource.apple.com/source/Libc/Libc-583/gen/malloc.c ).
   if (!result && size && alignment >= sizeof(void*)
       && (alignment & (alignment - 1)) == 0) {
-    DebugUtil::BreakDebugger();
+    debugger::BreakDebugger();
   }
   return result;
 }
@@ -450,7 +450,7 @@
                                   size_t size) {
   void* result = g_old_malloc_purgeable(zone, size);
   if (!result && size)
-    DebugUtil::BreakDebugger();
+    debugger::BreakDebugger();
   return result;
 }
 
@@ -459,7 +459,7 @@
                                   size_t size) {
   void* result = g_old_calloc_purgeable(zone, num_items, size);
   if (!result && num_items && size)
-    DebugUtil::BreakDebugger();
+    debugger::BreakDebugger();
   return result;
 }
 
@@ -467,7 +467,7 @@
                                   size_t size) {
   void* result = g_old_valloc_purgeable(zone, size);
   if (!result && size)
-    DebugUtil::BreakDebugger();
+    debugger::BreakDebugger();
   return result;
 }
 
@@ -476,7 +476,7 @@
                                    size_t size) {
   void* result = g_old_realloc_purgeable(zone, ptr, size);
   if (!result && size)
-    DebugUtil::BreakDebugger();
+    debugger::BreakDebugger();
   return result;
 }
 
@@ -489,7 +489,7 @@
   // http://opensource.apple.com/source/Libc/Libc-583/gen/malloc.c ).
   if (!result && size && alignment >= sizeof(void*)
       && (alignment & (alignment - 1)) == 0) {
-    DebugUtil::BreakDebugger();
+    debugger::BreakDebugger();
   }
   return result;
 }
@@ -497,7 +497,7 @@
 // === C++ operator new ===
 
 void oom_killer_new() {
-  DebugUtil::BreakDebugger();
+  debugger::BreakDebugger();
 }
 
 // === Core Foundation CFAllocators ===
@@ -513,7 +513,7 @@
                                             void* info) {
   void* result = g_old_cfallocator_system_default(alloc_size, hint, info);
   if (!result)
-    DebugUtil::BreakDebugger();
+    debugger::BreakDebugger();
   return result;
 }
 
@@ -522,7 +522,7 @@
                                     void* info) {
   void* result = g_old_cfallocator_malloc(alloc_size, hint, info);
   if (!result)
-    DebugUtil::BreakDebugger();
+    debugger::BreakDebugger();
   return result;
 }
 
@@ -531,7 +531,7 @@
                                          void* info) {
   void* result = g_old_cfallocator_malloc_zone(alloc_size, hint, info);
   if (!result)
-    DebugUtil::BreakDebugger();
+    debugger::BreakDebugger();
   return result;
 }
 
@@ -544,7 +544,7 @@
 {
   id result = g_old_allocWithZone(self, _cmd, zone);
   if (!result)
-    DebugUtil::BreakDebugger();
+    debugger::BreakDebugger();
   return result;
 }