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

app/resource_bundle_win.cc

 // Copyright (c) 2010 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 "app/resource_bundle.h"
 
 #include <atlbase.h>
 
 #include "app/app_paths.h"
 #include "app/l10n_util.h"
 #include "base/data_pack.h"
 #include "base/debug_util.h"
+#include "base/debug/stack_trace.h"
 #include "base/file_util.h"
 #include "base/lock.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/resource_util.h"
 #include "base/stl_util-inl.h"
 #include "base/string_piece.h"
 #include "base/win/windows_version.h"
 
 #include "gfx/font.h"
@@ skipping 109 matching lines @@
 // Loads and returns a cursor from the current module.
 HCURSOR ResourceBundle::LoadCursor(int cursor_id) {
   return ::LoadCursor(_AtlBaseModule.GetModuleInstance(),
                       MAKEINTRESOURCE(cursor_id));
 }
 
 string16 ResourceBundle::GetLocalizedString(int message_id) {
   // If for some reason we were unable to load a resource dll, return an empty
   // string (better than crashing).
   if (!locale_resources_data_) {
-    StackTrace().PrintBacktrace();  // See http://crbug.com/21925.
+    base::debug::StackTrace().PrintBacktrace();  // See http://crbug.com/21925.
     LOG(WARNING) << "locale resources are not loaded";
     return string16();
   }
 
   DCHECK(IS_INTRESOURCE(message_id));
 
   // Get a reference directly to the string resource.
   HINSTANCE hinstance = locale_resources_data_;
   const ATLSTRINGRESOURCEIMAGE* image = AtlGetStringResourceImage(hinstance,
                                                                   message_id);
   if (!image) {
     // Fall back on the current module (shouldn't be any strings here except
     // in unittests).
     image = AtlGetStringResourceImage(_AtlBaseModule.GetModuleInstance(),
                                       message_id);
     if (!image) {
-      StackTrace().PrintBacktrace();  // See http://crbug.com/21925.
+      // See http://crbug.com/21925.
+      base::debug::StackTrace().PrintBacktrace();
       NOTREACHED() << "unable to find resource: " << message_id;
       return std::wstring();
     }
   }
   // Copy into a string16 and return.
   return string16(image->achString, image->nLength);
 }