3 files changed, 19 insertions, 9 deletions
diff --git a/base/debug/debug_on_start_win.h b/base/debug/debug_on_start_win.h
index 5a1081d..4a5c120 100644
--- a/base/debug/debug_on_start_win.h
+++ b/base/debug/debug_on_start_win.h
@@ -24,6 +24,11 @@
 namespace base {
 namespace debug {
 
+// There is no way for this code, as currently implemented, to work across DLLs.
+// TODO(rvargas): It looks like we really don't use this code, at least not for
+// Chrome. Figure out if it's really worth implementing something simpler.
+#if !defined(BASE_DLL)
+
 // Debug on start functions and data.
 class DebugOnStart {
  public:
@@ -69,6 +74,8 @@ DECLSPEC_SELECTANY DebugOnStart::PIFV debug_on_start = &DebugOnStart::Init;
 
 #endif  // _WIN64
 
+#endif  // defined(BASE_DLL)
+
 }  // namespace debug
 }  // namespace base
 
diff --git a/base/debug/debugger.h b/base/debug/debugger.h
index 77bde0d..bb937a0 100644
--- a/base/debug/debugger.h
+++ b/base/debug/debugger.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -10,16 +10,18 @@
 #define BASE_DEBUG_DEBUGGER_H
 #pragma once
 
+#include "base/base_api.h"
+
 namespace base {
 namespace debug {
 
 // Starts the registered system-wide JIT debugger to attach it to specified
 // process.
-bool SpawnDebuggerOnProcess(unsigned process_id);
+BASE_API bool SpawnDebuggerOnProcess(unsigned process_id);
 
 // Waits wait_seconds seconds for a debugger to attach to the current process.
 // When silent is false, an exception is thrown when a debugger is detected.
-bool WaitForDebugger(int wait_seconds, bool silent);
+BASE_API bool WaitForDebugger(int wait_seconds, bool silent);
 
 // Returns true if the given process is being run under a debugger.
 //
@@ -28,18 +30,18 @@ bool WaitForDebugger(int wait_seconds, bool silent);
 //
 // WARNING: Because of this, on OS X, a call MUST be made to this function
 // BEFORE the sandbox is enabled.
-bool BeingDebugged();
+BASE_API bool BeingDebugged();
 
 // Break into the debugger, assumes a debugger is present.
-void BreakDebugger();
+BASE_API void BreakDebugger();
 
 // Used in test code, this controls whether showing dialogs and breaking into
 // the debugger is suppressed for debug errors, even in debug mode (normally
 // release mode doesn't do this stuff --  this is controlled separately).
 // Normally UI is not suppressed.  This is normally used when running automated
 // tests where we want a crash rather than a dialog or a debugger.
-void SetSuppressDebugUI(bool suppress);
-bool IsDebugUISuppressed();
+BASE_API void SetSuppressDebugUI(bool suppress);
+BASE_API bool IsDebugUISuppressed();
 
 }  // namespace debug
 }  // namespace base
diff --git a/base/debug/stack_trace.h b/base/debug/stack_trace.h
index 8afc32c..d8d792d 100644
--- a/base/debug/stack_trace.h
+++ b/base/debug/stack_trace.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -8,6 +8,7 @@
 
 #include <iosfwd>
 
+#include "base/base_api.h"
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
@@ -20,7 +21,7 @@ namespace debug {
 // A stacktrace can be helpful in debugging. For example, you can include a
 // stacktrace member in a object (probably around #ifndef NDEBUG) so that you
 // can later see where the given object was created from.
-class StackTrace {
+class BASE_API StackTrace {
  public:
   // Creates a stacktrace from the current location.
   StackTrace();