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..84ba48bc79ca37a0a0c7d2a43b959ce5dec7263c 100644 |
--- a/net/test/scoped_disable_exit_on_dfatal.h |
+++ b/net/test/scoped_disable_exit_on_dfatal.h |
@@ -23,12 +23,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 base::StringPiece& message, |
+ const base::StringPiece& stack_trace); |
+ |
+ logging::ScopedLogAssertHandler assert_handler_; |
DISALLOW_COPY_AND_ASSIGN(ScopedDisableExitOnDFatal); |
}; |