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

Side by Side Diff: net/spdy/spdy_stream_unittest.cc

Issue 17382012: [SPDY] Refactor SpdyStream's handling of response headers (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Forgot to rename a function Created 7 years, 6 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 | Annotate | Revision Log
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 <cstddef> 5 #include <cstddef>
6 #include <string> 6 #include <string>
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 221
222 // Conjure up a stream. 222 // Conjure up a stream.
223 SpdyStream stream(SPDY_PUSH_STREAM, 223 SpdyStream stream(SPDY_PUSH_STREAM,
224 spdy_session.get(), 224 spdy_session.get(),
225 std::string(), 225 std::string(),
226 DEFAULT_PRIORITY, 226 DEFAULT_PRIORITY,
227 kSpdyStreamInitialWindowSize, 227 kSpdyStreamInitialWindowSize,
228 kSpdyStreamInitialWindowSize, 228 kSpdyStreamInitialWindowSize,
229 net_log); 229 net_log);
230 stream.set_stream_id(2); 230 stream.set_stream_id(2);
231 EXPECT_FALSE(stream.response_received()); 231 EXPECT_FALSE(stream.ReceivedInitialResponseHeaders());
232 EXPECT_FALSE(stream.HasUrl()); 232 EXPECT_FALSE(stream.HasUrl());
233 233
234 // Set a couple of headers. 234 // Set a couple of headers.
235 SpdyHeaderBlock response; 235 SpdyHeaderBlock response;
236 spdy_util_.AddUrlToHeaderBlock(kStreamUrl, &response); 236 spdy_util_.AddUrlToHeaderBlock(kStreamUrl, &response);
237 stream.OnResponseHeadersReceived(response); 237 stream.OnInitialResponseHeadersReceived(
238 response, base::Time::Now(), base::TimeTicks::Now());
238 239
239 // Send some basic headers. 240 // Send some basic headers.
240 SpdyHeaderBlock headers; 241 SpdyHeaderBlock headers;
241 response[spdy_util_.GetStatusKey()] = "200"; 242 headers[spdy_util_.GetStatusKey()] = "200";
242 response[spdy_util_.GetVersionKey()] = "OK"; 243 headers[spdy_util_.GetVersionKey()] = "OK";
243 stream.OnHeaders(headers); 244 stream.OnAdditionalResponseHeadersReceived(headers);
244 245
245 stream.set_response_received(); 246 EXPECT_TRUE(stream.ReceivedInitialResponseHeaders());
246 EXPECT_TRUE(stream.response_received());
247 EXPECT_TRUE(stream.HasUrl()); 247 EXPECT_TRUE(stream.HasUrl());
248 EXPECT_EQ(kStreamUrl, stream.GetUrl().spec()); 248 EXPECT_EQ(kStreamUrl, stream.GetUrl().spec());
249 249
250 spdy_session->CloseSessionOnError( 250 spdy_session->CloseSessionOnError(
251 ERR_CONNECTION_CLOSED, true, "Closing session"); 251 ERR_CONNECTION_CLOSED, true, "Closing session");
252 } 252 }
253 253
254 TEST_P(SpdyStreamTest, StreamError) { 254 TEST_P(SpdyStreamTest, StreamError) {
255 GURL url(kStreamUrl); 255 GURL url(kStreamUrl);
256 256
(...skipping 540 matching lines...) Expand 10 before | Expand all | Expand 10 after
797 TEST_P(SpdyStreamTest, ResumeAfterSendWindowSizeAdjustBidirectional) { 797 TEST_P(SpdyStreamTest, ResumeAfterSendWindowSizeAdjustBidirectional) {
798 RunResumeAfterUnstallBidirectionalTest( 798 RunResumeAfterUnstallBidirectionalTest(
799 base::Bind(&AdjustStreamSendWindowSize)); 799 base::Bind(&AdjustStreamSendWindowSize));
800 } 800 }
801 801
802 } // namespace 802 } // namespace
803 803
804 } // namespace test 804 } // namespace test
805 805
806 } // namespace net 806 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698