| 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 5bb7643e57b01be7a263b8798d7dbd8ba109d3e7..33f06e3bc59ce534f786ba33ef58284938d6be83 100644
|
| --- a/net/test/scoped_disable_exit_on_dfatal.h
|
| +++ b/net/test/scoped_disable_exit_on_dfatal.h
|
| @@ -23,14 +23,12 @@
|
| ~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 char* file,
|
| - int line,
|
| - const base::StringPiece message,
|
| - const base::StringPiece stack_trace);
|
| -
|
| - logging::ScopedLogAssertHandler assert_handler_;
|
| + static void LogAssertHandler(const std::string& msg);
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ScopedDisableExitOnDFatal);
|
| };
|
|
|