Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(89)

Unified Diff: net/quic/quic_spdy_stream_test.cc

Issue 1908103002: Landing Recent QUIC changes until 4/15/2016 17:20 UTC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/quic/quic_spdy_stream.cc ('k') | net/quic/quic_stream_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_spdy_stream_test.cc
diff --git a/net/quic/quic_spdy_stream_test.cc b/net/quic/quic_spdy_stream_test.cc
index d01a2cd23938b5e82c70e5490d11db7d693e08dd..8edf223aa655d940985d2642b50fc4d32c60e7be 100644
--- a/net/quic/quic_spdy_stream_test.cc
+++ b/net/quic/quic_spdy_stream_test.cc
@@ -4,8 +4,9 @@
#include "net/quic/quic_spdy_stream.h"
-#include "base/strings/string_number_conversions.h"
+#include <memory>
+#include "base/strings/string_number_conversions.h"
#include "net/quic/quic_connection.h"
#include "net/quic/quic_utils.h"
#include "net/quic/quic_write_blocked_list.h"
@@ -97,7 +98,8 @@ class QuicSpdyStreamTest : public ::testing::TestWithParam<QuicVersion> {
void Initialize(bool stream_should_process_data) {
connection_ = new testing::StrictMock<MockConnection>(
- &helper_, Perspective::IS_SERVER, SupportedVersions(GetParam()));
+ &helper_, &alarm_factory_, Perspective::IS_SERVER,
+ SupportedVersions(GetParam()));
session_.reset(new testing::StrictMock<MockQuicSpdySession>(connection_));
stream_ = new TestStream(kClientDataStreamId1, session_.get(),
stream_should_process_data);
@@ -109,6 +111,7 @@ class QuicSpdyStreamTest : public ::testing::TestWithParam<QuicVersion> {
protected:
MockConnectionHelper helper_;
+ MockAlarmFactory alarm_factory_;
MockConnection* connection_;
std::unique_ptr<MockQuicSpdySession> session_;
« no previous file with comments | « net/quic/quic_spdy_stream.cc ('k') | net/quic/quic_stream_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698