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

base/test/test_suite.cc

 // Copyright (c) 2009 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 "base/test/test_suite.h"
 
 #include "base/at_exit.h"
 #include "base/base_paths.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug_on_start.h"
 #include "base/debug_util.h"
+#include "base/debug/debugger.h"
+#include "base/debug/debugger.h"
 #include "base/file_path.h"
 #include "base/i18n/icu_util.h"
 #include "base/logging.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/nss_util.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/scoped_ptr.h"
 #include "base/test/multiprocess_test.h"
 #include "base/test/test_timeouts.h"
@@ skipping 161 matching lines @@
   logging::SetLogItems(true, true, true, true);
 
   CHECK(base::EnableInProcessStackDumping());
 #if defined(OS_WIN)
   // Make sure we run with high resolution timer to minimize differences
   // between production code and test code.
   base::Time::EnableHighResolutionTimer(true);
 #endif  // defined(OS_WIN)
 
   // In some cases, we do not want to see standard error dialogs.
-  if (!DebugUtil::BeingDebugged() &&
+  if (!base::debug::BeingDebugged() &&
       !CommandLine::ForCurrentProcess()->HasSwitch("show-error-dialogs")) {
     SuppressErrorDialogs();
     DebugUtil::SuppressDialogs();
     logging::SetLogAssertHandler(UnitTestAssertHandler);
   }
 
   icu_util::Initialize();
 
 #if defined(USE_NSS)
   // Trying to repeatedly initialize and cleanup NSS and NSPR may result in
   // a deadlock. Such repeated initialization will happen when using test
   // isolation. Prevent problems by initializing NSS here, so that the cleanup
   // will be done only on process exit.
   base::EnsureNSSInit();
 #endif  // defined(USE_NSS)
 
   CatchMaybeTests();
 
   TestTimeouts::Initialize();
 }
 
 void TestSuite::Shutdown() {
 }