Index: net/quic/core/quic_spdy_stream_test.cc |
diff --git a/net/quic/core/quic_spdy_stream_test.cc b/net/quic/core/quic_spdy_stream_test.cc |
index a34b0c782442f2e03fad954bf55961c71469b8a6..e202b3c57f456d5db4f746a3515c5799d9491eab 100644 |
--- a/net/quic/core/quic_spdy_stream_test.cc |
+++ b/net/quic/core/quic_spdy_stream_test.cc |
@@ -13,13 +13,12 @@ |
#include "net/quic/core/spdy_utils.h" |
#include "net/quic/platform/api/quic_ptr_util.h" |
#include "net/quic/platform/api/quic_string_piece.h" |
+#include "net/quic/platform/api/quic_test.h" |
#include "net/quic/platform/api/quic_text_utils.h" |
#include "net/quic/test_tools/quic_flow_controller_peer.h" |
#include "net/quic/test_tools/quic_session_peer.h" |
#include "net/quic/test_tools/quic_stream_peer.h" |
#include "net/quic/test_tools/quic_test_utils.h" |
-#include "testing/gmock/include/gmock/gmock.h" |
-#include "testing/gtest/include/gtest/gtest.h" |
using std::string; |
using testing::AnyNumber; |
@@ -64,7 +63,7 @@ class TestStream : public QuicSpdyStream { |
string data_; |
}; |
-class QuicSpdyStreamTest : public ::testing::TestWithParam<QuicVersion> { |
+class QuicSpdyStreamTest : public QuicTestWithParam<QuicVersion> { |
public: |
QuicSpdyStreamTest() { |
headers_[":host"] = "www.google.com"; |
@@ -116,7 +115,6 @@ class QuicSpdyStreamTest : public ::testing::TestWithParam<QuicVersion> { |
} |
protected: |
- QuicFlagSaver flags_; // Save/restore all QUIC flag values. |
MockQuicConnectionHelper helper_; |
MockAlarmFactory alarm_factory_; |
MockQuicConnection* connection_; |