Use EXPECT_DFATAL instead of EXPECT_DEBUG_DEATH in spdy_protocol_test.cc.

Switch the associated DCHECK to a LOG_IF(DFATAL).

Move EXPECT_DFATAL, and friends, from net/quic/test_tools/ to net/test/.

Merge internal change: 60170975

Review URL: https://codereview.chromium.org/134193004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247136 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 33 insertions, 0 deletions

diff --git a/net/test/scoped_disable_exit_on_dfatal.cc b/net/test/scoped_disable_exit_on_dfatal.cc
new file mode 100644
index 0000000..f909126
--- /dev/null
+++ b/net/test/scoped_disable_exit_on_dfatal.cc
@@ -0,0 +1,33 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "net/test/scoped_disable_exit_on_dfatal.h"
+
+#include "base/logging.h"
+
+namespace net {
+namespace test {
+
+// static
+ScopedDisableExitOnDFatal* ScopedDisableExitOnDFatal::g_instance_ = NULL;
+
+ScopedDisableExitOnDFatal::ScopedDisableExitOnDFatal() {
+  CHECK(!g_instance_);
+  g_instance_ = this;
+  logging::SetLogAssertHandler(LogAssertHandler);
+}
+
+ScopedDisableExitOnDFatal::~ScopedDisableExitOnDFatal() {
+  CHECK_EQ(g_instance_, this);
+  logging::SetLogAssertHandler(NULL);
+  g_instance_ = NULL;
+}
+
+// static
+void ScopedDisableExitOnDFatal::LogAssertHandler(const std::string& str) {
+  // Simply swallow the assert.
+}
+
+}  // namespace test
+}  // namespace net