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

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

Issue 2642133002: Change WeakPtr<SpdyStream> to raw pointer in SpdyHttpStream. (Closed)
Patch Set: Nits. Created 3 years, 11 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/spdy/spdy_stream.h ('k') | no next file » | 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/spdy/spdy_stream.h" 5 #include "net/spdy/spdy_stream.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <cstddef> 10 #include <cstddef>
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 EXPECT_TRUE(stream->GetUrlFromHeaders().is_empty()); 336 EXPECT_TRUE(stream->GetUrlFromHeaders().is_empty());
337 337
338 SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)); 338 SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
339 EXPECT_THAT( 339 EXPECT_THAT(
340 stream->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND), 340 stream->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND),
341 IsError(ERR_IO_PENDING)); 341 IsError(ERR_IO_PENDING));
342 EXPECT_EQ(kDefaultUrl, stream->GetUrlFromHeaders().spec()); 342 EXPECT_EQ(kDefaultUrl, stream->GetUrlFromHeaders().spec());
343 343
344 data.RunUntilPaused(); 344 data.RunUntilPaused();
345 345
346 base::WeakPtr<SpdyStream> push_stream; 346 SpdyStream* push_stream;
347 EXPECT_THAT(session->GetPushStream(GURL(kPushUrl), IDLE, &push_stream, 347 EXPECT_THAT(session->GetPushStream(GURL(kPushUrl), IDLE, &push_stream,
348 NetLogWithSource()), 348 NetLogWithSource()),
349 IsOk()); 349 IsOk());
350 ASSERT_TRUE(push_stream); 350 ASSERT_TRUE(push_stream);
351 EXPECT_EQ(kPushUrl, push_stream->GetUrlFromHeaders().spec()); 351 EXPECT_EQ(kPushUrl, push_stream->GetUrlFromHeaders().spec());
352 352
353 LoadTimingInfo load_timing_info; 353 LoadTimingInfo load_timing_info;
354 EXPECT_TRUE(push_stream->GetLoadTimingInfo(&load_timing_info)); 354 EXPECT_TRUE(push_stream->GetLoadTimingInfo(&load_timing_info));
355 EXPECT_EQ(g_time_now, load_timing_info.push_start); 355 EXPECT_EQ(g_time_now, load_timing_info.push_start);
356 EXPECT_TRUE(load_timing_info.push_end.is_null()); 356 EXPECT_TRUE(load_timing_info.push_end.is_null());
357 357
358 StreamDelegateDoNothing push_delegate(push_stream); 358 StreamDelegateDoNothing push_delegate(push_stream->GetWeakPtr());
359 push_stream->SetDelegate(&push_delegate); 359 push_stream->SetDelegate(&push_delegate);
360 360
361 data.Resume(); 361 data.Resume();
362 362
363 EXPECT_TRUE(push_stream->GetLoadTimingInfo(&load_timing_info)); 363 EXPECT_TRUE(push_stream->GetLoadTimingInfo(&load_timing_info));
364 EXPECT_EQ(g_time_now, load_timing_info.push_start); 364 EXPECT_EQ(g_time_now, load_timing_info.push_start);
365 EXPECT_FALSE(load_timing_info.push_end.is_null()); 365 EXPECT_FALSE(load_timing_info.push_end.is_null());
366 366
367 EXPECT_THAT(delegate.WaitForClose(), IsOk()); 367 EXPECT_THAT(delegate.WaitForClose(), IsOk());
368 EXPECT_EQ("200", delegate.GetResponseHeaderValue(spdy_util_.GetStatusKey())); 368 EXPECT_EQ("200", delegate.GetResponseHeaderValue(spdy_util_.GetStatusKey()));
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 EXPECT_TRUE(stream->GetUrlFromHeaders().is_empty()); 649 EXPECT_TRUE(stream->GetUrlFromHeaders().is_empty());
650 650
651 SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)); 651 SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
652 EXPECT_THAT( 652 EXPECT_THAT(
653 stream->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND), 653 stream->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND),
654 IsError(ERR_IO_PENDING)); 654 IsError(ERR_IO_PENDING));
655 EXPECT_EQ(kDefaultUrl, stream->GetUrlFromHeaders().spec()); 655 EXPECT_EQ(kDefaultUrl, stream->GetUrlFromHeaders().spec());
656 656
657 data.RunUntilPaused(); 657 data.RunUntilPaused();
658 658
659 base::WeakPtr<SpdyStream> push_stream; 659 SpdyStream* push_stream;
660 EXPECT_THAT(session->GetPushStream(GURL(kPushUrl), IDLE, &push_stream, 660 EXPECT_THAT(session->GetPushStream(GURL(kPushUrl), IDLE, &push_stream,
661 NetLogWithSource()), 661 NetLogWithSource()),
662 IsOk()); 662 IsOk());
663 EXPECT_FALSE(push_stream); 663 EXPECT_FALSE(push_stream);
664 664
665 data.Resume(); 665 data.Resume();
666 666
667 EXPECT_THAT(delegate.WaitForClose(), IsError(ERR_CONNECTION_CLOSED)); 667 EXPECT_THAT(delegate.WaitForClose(), IsError(ERR_CONNECTION_CLOSED));
668 668
669 EXPECT_TRUE(data.AllWriteDataConsumed()); 669 EXPECT_TRUE(data.AllWriteDataConsumed());
(...skipping 829 matching lines...) Expand 10 before | Expand all | Expand 10 after
1499 EXPECT_EQ(response_len, stream->raw_received_bytes()); 1499 EXPECT_EQ(response_len, stream->raw_received_bytes());
1500 1500
1501 // FIN 1501 // FIN
1502 data.Resume(); 1502 data.Resume();
1503 EXPECT_THAT(delegate.WaitForClose(), IsError(ERR_CONNECTION_CLOSED)); 1503 EXPECT_THAT(delegate.WaitForClose(), IsError(ERR_CONNECTION_CLOSED));
1504 } 1504 }
1505 1505
1506 } // namespace test 1506 } // namespace test
1507 1507
1508 } // namespace net 1508 } // namespace net
OLDNEW
« no previous file with comments | « net/spdy/spdy_stream.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698