| Index: net/tools/quic/quic_server_test.cc
|
| diff --git a/net/tools/quic/quic_server_test.cc b/net/tools/quic/quic_server_test.cc
|
| index ec1bcae75113f698030ddbd094630cebd7013d9a..6c0037a3e85589c3be97e445e79439ae40836316 100644
|
| --- a/net/tools/quic/quic_server_test.cc
|
| +++ b/net/tools/quic/quic_server_test.cc
|
| @@ -9,13 +9,13 @@
|
| #include "net/quic/platform/api/quic_flags.h"
|
| #include "net/quic/platform/api/quic_logging.h"
|
| #include "net/quic/platform/api/quic_socket_address.h"
|
| +#include "net/quic/platform/api/quic_test.h"
|
| #include "net/quic/test_tools/crypto_test_utils.h"
|
| #include "net/quic/test_tools/mock_quic_dispatcher.h"
|
| #include "net/tools/quic/quic_epoll_alarm_factory.h"
|
| #include "net/tools/quic/quic_epoll_connection_helper.h"
|
| #include "net/tools/quic/quic_simple_crypto_server_stream_helper.h"
|
| #include "net/tools/quic/test_tools/quic_server_peer.h"
|
| -#include "testing/gtest/include/gtest/gtest.h"
|
|
|
| using ::testing::_;
|
|
|
| @@ -78,7 +78,7 @@ class TestQuicServer : public QuicServer {
|
| QuicHttpResponseCache response_cache_;
|
| };
|
|
|
| -class QuicServerEpollInTest : public ::testing::Test {
|
| +class QuicServerEpollInTest : public QuicTest {
|
| public:
|
| QuicServerEpollInTest()
|
| : port_(net::test::kTestPort),
|
| @@ -95,7 +95,6 @@ class QuicServerEpollInTest : public ::testing::Test {
|
| }
|
|
|
| protected:
|
| - QuicFlagSaver saver_;
|
| int port_;
|
| QuicSocketAddress server_address_;
|
| TestQuicServer server_;
|
| @@ -142,7 +141,7 @@ TEST_F(QuicServerEpollInTest, ProcessBufferedCHLOsOnEpollin) {
|
| }
|
| }
|
|
|
| -class QuicServerDispatchPacketTest : public ::testing::Test {
|
| +class QuicServerDispatchPacketTest : public QuicTest {
|
| public:
|
| QuicServerDispatchPacketTest()
|
| : crypto_config_("blah",
|
|
|