| Index: sandbox/linux/tests/main.cc
|
| diff --git a/sandbox/linux/tests/main.cc b/sandbox/linux/tests/main.cc
|
| index 223a320405566f8ca04cdd4074293d97db1c8887..caeddee32cfac67a7d040150bd08977591698a5c 100644
|
| --- a/sandbox/linux/tests/main.cc
|
| +++ b/sandbox/linux/tests/main.cc
|
| @@ -4,7 +4,6 @@
|
|
|
| #include "base/at_exit.h"
|
| #include "base/base_switches.h"
|
| -#include "base/bind.h"
|
| #include "base/command_line.h"
|
| #include "base/files/file_path.h"
|
| #include "base/files/file_util.h"
|
| @@ -38,10 +37,7 @@
|
| } // namespace sandbox
|
|
|
| #if !defined(SANDBOX_USES_BASE_TEST_SUITE)
|
| -void UnitTestAssertHandler(const char* file,
|
| - int line,
|
| - const base::StringPiece message,
|
| - const base::StringPiece stack_trace) {
|
| +void UnitTestAssertHandler(const std::string& str) {
|
| _exit(1);
|
| }
|
| #endif
|
| @@ -68,8 +64,7 @@
|
| // Death tests rely on LOG(FATAL) triggering an exit (the default behavior is
|
| // SIGABRT). The normal test launcher does this at initialization, but since
|
| // we still do not use this on Android, we must install the handler ourselves.
|
| - logging::ScopedLogAssertHandler scoped_assert_handler(
|
| - base::Bind(UnitTestAssertHandler));
|
| + logging::SetLogAssertHandler(UnitTestAssertHandler);
|
| #endif
|
| // Always go through re-execution for death tests.
|
| // This makes gtest only marginally slower for us and has the
|
|
|