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

Side by Side Diff: net/quic/quic_spdy_stream_test.cc

Issue 1898793003: Make QuicDispatcher's helper and alarm factory arguments unique_ptrs to make ownership clear. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@119871679
Patch Set: fixing rebase 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 unified diff | Download patch
« no previous file with comments | « net/quic/quic_session_test.cc ('k') | net/quic/quic_stream_factory.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/quic/quic_spdy_stream.h" 5 #include "net/quic/quic_spdy_stream.h"
6 6
7 #include "base/strings/string_number_conversions.h" 7 #include "base/strings/string_number_conversions.h"
8 8
9 #include "net/quic/quic_connection.h" 9 #include "net/quic/quic_connection.h"
10 #include "net/quic/quic_utils.h" 10 #include "net/quic/quic_utils.h"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 "Rgj3RWUoPumQVCxtSOBdX0GlJOEcDTNCzQIm9BSfetog_eP_TfYubKudt5eMsXmN6" 90 "Rgj3RWUoPumQVCxtSOBdX0GlJOEcDTNCzQIm9BSfetog_eP_TfYubKudt5eMsXmN6"
91 "QnyXHeGeK2UINUzJ-D30AFcpqYgH9_1BvYSpi7fc7_ydBU8TaD8ZRxvtnzXqj0RfG" 91 "QnyXHeGeK2UINUzJ-D30AFcpqYgH9_1BvYSpi7fc7_ydBU8TaD8ZRxvtnzXqj0RfG"
92 "tuHghmv3aD-uzSYJ75XDdzKdizZ86IG6Fbn1XFhYZM-fbHhm3mVEXnyRW4ZuNOLFk" 92 "tuHghmv3aD-uzSYJ75XDdzKdizZ86IG6Fbn1XFhYZM-fbHhm3mVEXnyRW4ZuNOLFk"
93 "Fas6LMcVC6Q8QLlHYbXBpdNFuGbuZGUnav5C-2I_-46lL0NGg3GewxGKGHvHEfoyn" 93 "Fas6LMcVC6Q8QLlHYbXBpdNFuGbuZGUnav5C-2I_-46lL0NGg3GewxGKGHvHEfoyn"
94 "EFFlEYHsBQ98rXImL8ySDycdLEFvBPdtctPmWCfTxwmoSMLHU2SCVDhbqMWU5b0yr" 94 "EFFlEYHsBQ98rXImL8ySDycdLEFvBPdtctPmWCfTxwmoSMLHU2SCVDhbqMWU5b0yr"
95 "JBCScs_ejbKaqBDoB7ZGxTvqlrB__2ZmnHHjCr8RgMRtKNtIeuZAo "; 95 "JBCScs_ejbKaqBDoB7ZGxTvqlrB__2ZmnHHjCr8RgMRtKNtIeuZAo ";
96 } 96 }
97 97
98 void Initialize(bool stream_should_process_data) { 98 void Initialize(bool stream_should_process_data) {
99 connection_ = new testing::StrictMock<MockConnection>( 99 connection_ = new testing::StrictMock<MockConnection>(
100 &helper_, Perspective::IS_SERVER, SupportedVersions(GetParam())); 100 &helper_, &alarm_factory_, Perspective::IS_SERVER,
101 SupportedVersions(GetParam()));
101 session_.reset(new testing::StrictMock<MockQuicSpdySession>(connection_)); 102 session_.reset(new testing::StrictMock<MockQuicSpdySession>(connection_));
102 stream_ = new TestStream(kClientDataStreamId1, session_.get(), 103 stream_ = new TestStream(kClientDataStreamId1, session_.get(),
103 stream_should_process_data); 104 stream_should_process_data);
104 session_->ActivateStream(stream_); 105 session_->ActivateStream(stream_);
105 stream2_ = new TestStream(kClientDataStreamId2, session_.get(), 106 stream2_ = new TestStream(kClientDataStreamId2, session_.get(),
106 stream_should_process_data); 107 stream_should_process_data);
107 session_->ActivateStream(stream2_); 108 session_->ActivateStream(stream2_);
108 } 109 }
109 110
110 protected: 111 protected:
111 MockConnectionHelper helper_; 112 MockConnectionHelper helper_;
113 MockAlarmFactory alarm_factory_;
112 MockConnection* connection_; 114 MockConnection* connection_;
113 std::unique_ptr<MockQuicSpdySession> session_; 115 std::unique_ptr<MockQuicSpdySession> session_;
114 116
115 // Owned by the |session_|. 117 // Owned by the |session_|.
116 TestStream* stream_; 118 TestStream* stream_;
117 TestStream* stream2_; 119 TestStream* stream2_;
118 120
119 SpdyHeaderBlock headers_; 121 SpdyHeaderBlock headers_;
120 }; 122 };
121 123
(...skipping 866 matching lines...) Expand 10 before | Expand all | Expand 10 after
988 990
989 // Writing Trailers should fail, as the FIN has already been sent. 991 // Writing Trailers should fail, as the FIN has already been sent.
990 // populated with the number of body bytes written. 992 // populated with the number of body bytes written.
991 EXPECT_DFATAL(stream_->WriteTrailers(SpdyHeaderBlock(), nullptr), 993 EXPECT_DFATAL(stream_->WriteTrailers(SpdyHeaderBlock(), nullptr),
992 "Trailers cannot be sent after a FIN"); 994 "Trailers cannot be sent after a FIN");
993 } 995 }
994 996
995 } // namespace 997 } // namespace
996 } // namespace test 998 } // namespace test
997 } // namespace net 999 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/quic_session_test.cc ('k') | net/quic/quic_stream_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698