| Index: net/test/scoped_disable_exit_on_dfatal.h
|
| diff --git a/net/test/scoped_disable_exit_on_dfatal.h b/net/test/scoped_disable_exit_on_dfatal.h
|
| index 33f06e3bc59ce534f786ba33ef58284938d6be83..38164c8c68ce09c9e41fb952bae0962f6633b86b 100644
|
| --- a/net/test/scoped_disable_exit_on_dfatal.h
|
| +++ b/net/test/scoped_disable_exit_on_dfatal.h
|
| @@ -7,6 +7,7 @@
|
|
|
| #include "base/logging.h"
|
| #include "base/macros.h"
|
| +#include "base/test/logging_utils.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @@ -23,12 +24,14 @@ class ScopedDisableExitOnDFatal {
|
| ~ScopedDisableExitOnDFatal();
|
|
|
| private:
|
| - // Currently active instance.
|
| - static ScopedDisableExitOnDFatal* g_instance_;
|
| -
|
| // Static function which is set as the logging assert handler.
|
| // Called when there is a check failure.
|
| - static void LogAssertHandler(const std::string& msg);
|
| + static void LogAssertHandler(const char* file,
|
| + int line,
|
| + const std::string& message,
|
| + const std::string& stack_trace);
|
| +
|
| + logging::ScopedLogAssertHandler assert_handler_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ScopedDisableExitOnDFatal);
|
| };
|
|
|