Move DumpProcessWithoutCrash to base, so we can use it from net and content

chrome/browser/metrics/thread_watcher.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 "chrome/browser/metrics/thread_watcher.h"
 
 #include <math.h>  // ceil
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/debug/alias.h"
+#include "base/debug/dump_without_crashing.h"
 #include "base/lazy_instance.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread_restrictions.h"
 #include "build/build_config.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
-#include "chrome/common/dump_without_crashing.h"
 #include "chrome/common/logging_chrome.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 using content::BrowserThread;
 
 namespace {
 
 // The following are unique function names for forcing the crash when a thread
 // is unresponsive. This makes it possible to tell from the callstack alone what
 // thread was unresponsive.
 //
 // We disable optimizations for this block of functions so the compiler doesn't
 // merge them all together.
 MSVC_DISABLE_OPTIMIZE()
 MSVC_PUSH_DISABLE_WARNING(4748)
 
 #ifndef NDEBUG
 int* NullPointer() {
   return reinterpret_cast<int*>(NULL);
 }
 #endif
 
 void NullPointerCrash(int line_number) {
 #ifndef NDEBUG
   *NullPointer() = line_number;  // Crash.
 #else
-  logging::DumpWithoutCrashing();
+  base::debug::DumpWithoutCrashing();
 #endif
 }
 
 NOINLINE void ShutdownCrash() {
   NullPointerCrash(__LINE__);
 }
 
 NOINLINE void ThreadUnresponsive_UI() {
   NullPointerCrash(__LINE__);
 }
@@ skipping 791 matching lines @@
       : base::Watchdog(duration, "Startup watchdog thread", true) {
   }
 
   // Alarm is called if the time expires after an Arm() without someone calling
   // Disarm(). When Alarm goes off, in release mode we get the crash dump
   // without crashing and in debug mode we break into the debugger.
   virtual void Alarm() OVERRIDE {
 #ifndef NDEBUG
     DCHECK(false);
 #else
-    logging::DumpWithoutCrashing();
+    base::debug::DumpWithoutCrashing();
 #endif
   }
 
   DISALLOW_COPY_AND_ASSIGN(StartupWatchDogThread);
 };
 
 // ShutdownWatchDogThread methods and members.
 //
 // Class for detecting hangs during shutdown.
 class ShutdownWatchDogThread : public base::Watchdog {
@@ skipping 108 matching lines @@
 
 #if defined(OS_WIN)
   // On Windows XP, give twice the time for shutdown.
   if (base::win::GetVersion() <= base::win::VERSION_XP)
     actual_duration *= 2;
 #endif
 
   shutdown_watchdog_ = new ShutdownWatchDogThread(actual_duration);
   shutdown_watchdog_->Arm();
 }