diff options
| author | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-25 20:31:10 +0000 |
|---|---|---|
| committer | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-25 20:31:10 +0000 |
| commit | be8cff83b5fdd35792ff5612043972182fa9c67d (patch) | |
| tree | 5d248e488e15fea31969878bc40c5ad5f72ba68f /net/net.gyp | |
| parent | 8e89b03ada36070a5f22791ff51a23539b471798 (diff) | |
| download | chromium_src-be8cff83b5fdd35792ff5612043972182fa9c67d.zip chromium_src-be8cff83b5fdd35792ff5612043972182fa9c67d.tar.gz chromium_src-be8cff83b5fdd35792ff5612043972182fa9c67d.tar.bz2 | |
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
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/net.gyp b/net/net.gyp index 2f4561e..5cedf84 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -1863,7 +1863,6 @@ 'quic/test_tools/crypto_test_utils_openssl.cc', 'quic/test_tools/delayed_verify_strike_register_client.cc', 'quic/test_tools/delayed_verify_strike_register_client.h', - 'quic/test_tools/gtest_util.h', 'quic/test_tools/mock_clock.cc', 'quic/test_tools/mock_clock.h', 'quic/test_tools/mock_crypto_client_stream.cc', @@ -1894,10 +1893,6 @@ 'quic/test_tools/quic_test_utils.h', 'quic/test_tools/reliable_quic_stream_peer.cc', 'quic/test_tools/reliable_quic_stream_peer.h', - 'quic/test_tools/scoped_disable_exit_on_dfatal.cc', - 'quic/test_tools/scoped_disable_exit_on_dfatal.h', - 'quic/test_tools/scoped_mock_log.cc', - 'quic/test_tools/scoped_mock_log.h', 'quic/test_tools/simple_quic_framer.cc', 'quic/test_tools/simple_quic_framer.h', 'quic/test_tools/test_task_runner.cc', @@ -2012,11 +2007,16 @@ 'ssl/ssl_cipher_suite_names_unittest.cc', 'ssl/ssl_client_auth_cache_unittest.cc', 'ssl/ssl_config_service_unittest.cc', + 'test/gtest_util.h', 'test/embedded_test_server/embedded_test_server_unittest.cc', 'test/embedded_test_server/http_request_unittest.cc', 'test/embedded_test_server/http_response_unittest.cc', 'test/python_utils_unittest.cc', 'test/run_all_unittests.cc', + 'test/scoped_disable_exit_on_dfatal.cc', + 'test/scoped_disable_exit_on_dfatal.h', + 'test/scoped_mock_log.cc', + 'test/scoped_mock_log.h', 'test/test_certificate_data.h', 'tools/dump_cache/url_to_filename_encoder.cc', 'tools/dump_cache/url_to_filename_encoder.h', |