Chromium Code Reviews| Index: sandbox/linux/tests/main.cc |
| diff --git a/sandbox/linux/tests/main.cc b/sandbox/linux/tests/main.cc |
| index caeddee32cfac67a7d040150bd08977591698a5c..826dc13041f4916fdf3c42d7d2e8188257749edd 100644 |
| --- a/sandbox/linux/tests/main.cc |
| +++ b/sandbox/linux/tests/main.cc |
| @@ -4,10 +4,12 @@ |
| #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" |
| #include "base/logging.h" |
| +#include "base/test/logging_utils.h" |
| #include "base/test/test_suite.h" |
| #include "build/build_config.h" |
| #include "sandbox/linux/tests/test_utils.h" |
| @@ -37,7 +39,8 @@ void RunPostTestsChecks(const base::FilePath& orig_cwd) { |
| } // namespace sandbox |
| #if !defined(SANDBOX_USES_BASE_TEST_SUITE) |
| -void UnitTestAssertHandler(const std::string& str) { |
| +void UnitTestAssertHandler(const char* file, int line, size_t message_start, |
|
Paweł Hajdan Jr.
2017/02/13 17:17:24
This seems to still use the old signature.
alex-ac
2017/02/14 10:34:28
Done.
|
| + size_t stack_start, const std::string& str) { |
| _exit(1); |
| } |
| #endif |
| @@ -64,7 +67,8 @@ int main(int argc, char* argv[]) { |
| // 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::SetLogAssertHandler(UnitTestAssertHandler); |
| + logging::ScopedLogAssertHandler scoped_assert_handler( |
| + base::Bind(UnitTestAssertHandler)); |
| #endif |
| // Always go through re-execution for death tests. |
| // This makes gtest only marginally slower for us and has the |