aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/client/linux/handler/exception_handler.cc12
-rw-r--r--src/client/linux/handler/exception_handler.h5
-rw-r--r--src/client/linux/handler/exception_handler_unittest.cc21
3 files changed, 0 insertions, 38 deletions
diff --git a/src/client/linux/handler/exception_handler.cc b/src/client/linux/handler/exception_handler.cc
index 0d7cd9cf..b895f6d7 100644
--- a/src/client/linux/handler/exception_handler.cc
+++ b/src/client/linux/handler/exception_handler.cc
@@ -213,7 +213,6 @@ pthread_mutex_t g_handler_stack_mutex_ = PTHREAD_MUTEX_INITIALIZER;
ExceptionHandler::CrashContext g_crash_context_;
FirstChanceHandler g_first_chance_handler_ = nullptr;
-FirstChanceHandlerDeprecated g_first_chance_handler_deprecated_ = nullptr;
} // namespace
// Runs before crashing: normal context.
@@ -339,11 +338,6 @@ void ExceptionHandler::SignalHandler(int sig, siginfo_t* info, void* uc) {
return;
}
- if (g_first_chance_handler_deprecated_ != nullptr &&
- g_first_chance_handler_deprecated_(sig, info, uc)) {
- return;
- }
-
// All the exception signals are blocked at this point.
pthread_mutex_lock(&g_handler_stack_mutex_);
@@ -797,13 +791,7 @@ bool ExceptionHandler::WriteMinidumpForChild(pid_t child,
}
void SetFirstChanceExceptionHandler(FirstChanceHandler callback) {
- g_first_chance_handler_deprecated_ = nullptr;
g_first_chance_handler_ = callback;
}
-void SetFirstChanceExceptionHandler(FirstChanceHandlerDeprecated callback) {
- g_first_chance_handler_ = nullptr;
- g_first_chance_handler_deprecated_ = callback;
-}
-
} // namespace google_breakpad
diff --git a/src/client/linux/handler/exception_handler.h b/src/client/linux/handler/exception_handler.h
index 1ddeac88..f44483ff 100644
--- a/src/client/linux/handler/exception_handler.h
+++ b/src/client/linux/handler/exception_handler.h
@@ -276,11 +276,6 @@ class ExceptionHandler {
typedef bool (*FirstChanceHandler)(int, siginfo_t*, void*);
void SetFirstChanceExceptionHandler(FirstChanceHandler callback);
-typedef bool (*FirstChanceHandlerDeprecated)(int, void*, void*);
-// Deprecated. Use SetFirstChanceExceptionHandler(FirstChanceHandler callback)
-// instead.
-void SetFirstChanceExceptionHandler(FirstChanceHandlerDeprecated callback);
-
} // namespace google_breakpad
#endif // CLIENT_LINUX_HANDLER_EXCEPTION_HANDLER_H_
diff --git a/src/client/linux/handler/exception_handler_unittest.cc b/src/client/linux/handler/exception_handler_unittest.cc
index 2e4eb09a..3040e0f1 100644
--- a/src/client/linux/handler/exception_handler_unittest.cc
+++ b/src/client/linux/handler/exception_handler_unittest.cc
@@ -528,32 +528,11 @@ TEST(ExceptionHandlerTest, StackedHandlersUnhandledToBottom) {
namespace {
const int kSimpleFirstChanceReturnStatus = 42;
-bool SimpleFirstChanceHandlerDeprecated(int, void*, void*) {
- _exit(kSimpleFirstChanceReturnStatus);
-}
-
bool SimpleFirstChanceHandler(int, siginfo_t*, void*) {
_exit(kSimpleFirstChanceReturnStatus);
}
}
-TEST(ExceptionHandlerTest, FirstChanceHandlerRunsDeprecated) {
- AutoTempDir temp_dir;
-
- const pid_t child = fork();
- if (child == 0) {
- ExceptionHandler handler(
- MinidumpDescriptor(temp_dir.path()), NULL, NULL, NULL, true, -1);
- google_breakpad::SetFirstChanceExceptionHandler(
- SimpleFirstChanceHandlerDeprecated);
- DoNullPointerDereference();
- }
- int status;
- ASSERT_NE(HANDLE_EINTR(waitpid(child, &status, 0)), -1);
- ASSERT_TRUE(WIFEXITED(status));
- ASSERT_EQ(kSimpleFirstChanceReturnStatus, WEXITSTATUS(status));
-}
-
TEST(ExceptionHandlerTest, FirstChanceHandlerRuns) {
AutoTempDir temp_dir;