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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2102253003: Make SpdyHeaderBlock non-copyable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: iOS fix. Created 4 years, 5 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_protocol.h ('k') | net/spdy/spdy_stream.cc » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_session.h" 5 #include "net/spdy/spdy_session.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/base64.h" 10 #include "base/base64.h"
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 test::StreamDelegateDoNothing delegate1(spdy_stream1); 405 test::StreamDelegateDoNothing delegate1(spdy_stream1);
406 spdy_stream1->SetDelegate(&delegate1); 406 spdy_stream1->SetDelegate(&delegate1);
407 407
408 base::WeakPtr<SpdyStream> spdy_stream2 = CreateStreamSynchronously( 408 base::WeakPtr<SpdyStream> spdy_stream2 = CreateStreamSynchronously(
409 SPDY_REQUEST_RESPONSE_STREAM, session_, test_url_, MEDIUM, BoundNetLog()); 409 SPDY_REQUEST_RESPONSE_STREAM, session_, test_url_, MEDIUM, BoundNetLog());
410 test::StreamDelegateDoNothing delegate2(spdy_stream2); 410 test::StreamDelegateDoNothing delegate2(spdy_stream2);
411 spdy_stream2->SetDelegate(&delegate2); 411 spdy_stream2->SetDelegate(&delegate2);
412 412
413 std::unique_ptr<SpdyHeaderBlock> headers( 413 std::unique_ptr<SpdyHeaderBlock> headers(
414 new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl))); 414 new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
415 std::unique_ptr<SpdyHeaderBlock> headers2(new SpdyHeaderBlock(*headers)); 415 std::unique_ptr<SpdyHeaderBlock> headers2(
416 new SpdyHeaderBlock(headers->Clone()));
416 417
417 spdy_stream1->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND); 418 spdy_stream1->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
418 EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders()); 419 EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
419 spdy_stream2->SendRequestHeaders(std::move(headers2), NO_MORE_DATA_TO_SEND); 420 spdy_stream2->SendRequestHeaders(std::move(headers2), NO_MORE_DATA_TO_SEND);
420 EXPECT_TRUE(spdy_stream2->HasUrlFromHeaders()); 421 EXPECT_TRUE(spdy_stream2->HasUrlFromHeaders());
421 422
422 base::RunLoop().RunUntilIdle(); 423 base::RunLoop().RunUntilIdle();
423 424
424 EXPECT_EQ(1u, spdy_stream1->stream_id()); 425 EXPECT_EQ(1u, spdy_stream1->stream_id());
425 EXPECT_EQ(3u, spdy_stream2->stream_id()); 426 EXPECT_EQ(3u, spdy_stream2->stream_id());
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 test::StreamDelegateDoNothing delegate1(spdy_stream1); 545 test::StreamDelegateDoNothing delegate1(spdy_stream1);
545 spdy_stream1->SetDelegate(&delegate1); 546 spdy_stream1->SetDelegate(&delegate1);
546 547
547 base::WeakPtr<SpdyStream> spdy_stream2 = CreateStreamSynchronously( 548 base::WeakPtr<SpdyStream> spdy_stream2 = CreateStreamSynchronously(
548 SPDY_REQUEST_RESPONSE_STREAM, session_, test_url_, MEDIUM, BoundNetLog()); 549 SPDY_REQUEST_RESPONSE_STREAM, session_, test_url_, MEDIUM, BoundNetLog());
549 test::StreamDelegateDoNothing delegate2(spdy_stream2); 550 test::StreamDelegateDoNothing delegate2(spdy_stream2);
550 spdy_stream2->SetDelegate(&delegate2); 551 spdy_stream2->SetDelegate(&delegate2);
551 552
552 std::unique_ptr<SpdyHeaderBlock> headers( 553 std::unique_ptr<SpdyHeaderBlock> headers(
553 new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl))); 554 new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
554 std::unique_ptr<SpdyHeaderBlock> headers2(new SpdyHeaderBlock(*headers)); 555 std::unique_ptr<SpdyHeaderBlock> headers2(
556 new SpdyHeaderBlock(headers->Clone()));
555 557
556 spdy_stream1->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND); 558 spdy_stream1->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
557 EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders()); 559 EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
558 spdy_stream2->SendRequestHeaders(std::move(headers2), NO_MORE_DATA_TO_SEND); 560 spdy_stream2->SendRequestHeaders(std::move(headers2), NO_MORE_DATA_TO_SEND);
559 EXPECT_TRUE(spdy_stream2->HasUrlFromHeaders()); 561 EXPECT_TRUE(spdy_stream2->HasUrlFromHeaders());
560 562
561 base::RunLoop().RunUntilIdle(); 563 base::RunLoop().RunUntilIdle();
562 564
563 EXPECT_EQ(1u, spdy_stream1->stream_id()); 565 EXPECT_EQ(1u, spdy_stream1->stream_id());
564 EXPECT_EQ(3u, spdy_stream2->stream_id()); 566 EXPECT_EQ(3u, spdy_stream2->stream_id());
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
618 test::StreamDelegateDoNothing delegate1(spdy_stream1); 620 test::StreamDelegateDoNothing delegate1(spdy_stream1);
619 spdy_stream1->SetDelegate(&delegate1); 621 spdy_stream1->SetDelegate(&delegate1);
620 622
621 base::WeakPtr<SpdyStream> spdy_stream2 = CreateStreamSynchronously( 623 base::WeakPtr<SpdyStream> spdy_stream2 = CreateStreamSynchronously(
622 SPDY_REQUEST_RESPONSE_STREAM, session_, test_url_, MEDIUM, BoundNetLog()); 624 SPDY_REQUEST_RESPONSE_STREAM, session_, test_url_, MEDIUM, BoundNetLog());
623 test::StreamDelegateDoNothing delegate2(spdy_stream2); 625 test::StreamDelegateDoNothing delegate2(spdy_stream2);
624 spdy_stream2->SetDelegate(&delegate2); 626 spdy_stream2->SetDelegate(&delegate2);
625 627
626 std::unique_ptr<SpdyHeaderBlock> headers( 628 std::unique_ptr<SpdyHeaderBlock> headers(
627 new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl))); 629 new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
628 std::unique_ptr<SpdyHeaderBlock> headers2(new SpdyHeaderBlock(*headers)); 630 std::unique_ptr<SpdyHeaderBlock> headers2(
631 new SpdyHeaderBlock(headers->Clone()));
629 632
630 spdy_stream1->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND); 633 spdy_stream1->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
631 EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders()); 634 EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
632 spdy_stream2->SendRequestHeaders(std::move(headers2), NO_MORE_DATA_TO_SEND); 635 spdy_stream2->SendRequestHeaders(std::move(headers2), NO_MORE_DATA_TO_SEND);
633 EXPECT_TRUE(spdy_stream2->HasUrlFromHeaders()); 636 EXPECT_TRUE(spdy_stream2->HasUrlFromHeaders());
634 637
635 base::RunLoop().RunUntilIdle(); 638 base::RunLoop().RunUntilIdle();
636 639
637 EXPECT_EQ(1u, spdy_stream1->stream_id()); 640 EXPECT_EQ(1u, spdy_stream1->stream_id());
638 EXPECT_EQ(3u, spdy_stream2->stream_id()); 641 EXPECT_EQ(3u, spdy_stream2->stream_id());
(...skipping 5254 matching lines...) Expand 10 before | Expand all | Expand 10 after
5893 ssl_info.cert = ImportCertFromFile(GetTestCertsDirectory(), 5896 ssl_info.cert = ImportCertFromFile(GetTestCertsDirectory(),
5894 "spdy_pooling.pem"); 5897 "spdy_pooling.pem");
5895 ssl_info.is_issued_by_known_root = true; 5898 ssl_info.is_issued_by_known_root = true;
5896 ssl_info.public_key_hashes.push_back(test::GetTestHashValue(primary_pin)); 5899 ssl_info.public_key_hashes.push_back(test::GetTestHashValue(primary_pin));
5897 5900
5898 EXPECT_TRUE(SpdySession::CanPool( 5901 EXPECT_TRUE(SpdySession::CanPool(
5899 &tss, ssl_info, "www.example.org", "mail.example.org")); 5902 &tss, ssl_info, "www.example.org", "mail.example.org"));
5900 } 5903 }
5901 5904
5902 } // namespace net 5905 } // namespace net
OLDNEW
« no previous file with comments | « net/spdy/spdy_protocol.h ('k') | net/spdy/spdy_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698