Index: net/tools/stress_cache/stress_cache.cc |
diff --git a/net/tools/stress_cache/stress_cache.cc b/net/tools/stress_cache/stress_cache.cc |
index fefcd72f23d7177f48a743d6bc33cf610fe72b67..3b141d18d29a140461296e151ff7a60ef46b2346 100644 |
--- a/net/tools/stress_cache/stress_cache.cc |
+++ b/net/tools/stress_cache/stress_cache.cc |
@@ -34,6 +34,7 @@ |
#include "base/strings/string_number_conversions.h" |
#include "base/strings/string_util.h" |
#include "base/strings/utf_string_conversions.h" |
+#include "base/test/logging_utils.h" |
#include "base/threading/platform_thread.h" |
#include "base/threading/thread.h" |
#include "base/threading/thread_task_runner_handle.h" |
@@ -379,7 +380,11 @@ bool StartCrashThread() { |
return true; |
} |
-void CrashHandler(const std::string& str) { |
+void CrashHandler(const char* file, |
+ int line, |
+ size_t message_start, |
+ size_t stack_start, |
+ const std::string& str) { |
g_crashing = true; |
base::debug::BreakDebugger(); |
} |
@@ -414,7 +419,8 @@ int main(int argc, const char* argv[]) { |
if (argc < 2) |
return MasterCode(); |
- logging::SetLogAssertHandler(CrashHandler); |
+ logging::ScopedLogAssertHandler scoped_assert_handler( |
+ base::Bind(CrashHandler)); |
logging::SetLogMessageHandler(MessageHandler); |
#if defined(OS_WIN) |