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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/spdy/spdy_network_transaction_unittest.cc

Issue 2596703002: http2: Update priorities of pushed streams (Closed)
Patch Set: actually rebase 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/spdy/spdy_http_stream.cc ('k') | net/spdy/spdy_session.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_network_transaction_unittest.cc
diff --git a/net/spdy/spdy_network_transaction_unittest.cc b/net/spdy/spdy_network_transaction_unittest.cc
index 817a2b16ff703602da318384f148e18af10cb088..dfd781554dc08d17054aff29e1e6f7c73d178e8a 100644
--- a/net/spdy/spdy_network_transaction_unittest.cc
+++ b/net/spdy/spdy_network_transaction_unittest.cc
@@ -107,7 +107,7 @@ class SpdyNetworkTransactionTest : public ::testing::Test {
std::unique_ptr<SpdySessionDependencies> session_deps)
: request_(request),
priority_(priority),
- session_deps_(session_deps.get() == NULL
+ session_deps_(session_deps.get() == nullptr
? base::MakeUnique<SpdySessionDependencies>()
: std::move(session_deps)),
session_(
@@ -445,7 +445,7 @@ class SpdyNetworkTransactionTest : public ::testing::Test {
HttpResponseInfo* push_response,
const std::string& expected) {
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunPreTestSetup();
helper.AddData(data);
@@ -565,7 +565,7 @@ TEST_F(SpdyNetworkTransactionTest, Get) {
spdy_util_.ConstructSpdyGet(nullptr, 0, 1, LOWEST, true));
MockWrite writes[] = {CreateMockWrite(req, 0)};
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
SpdySerializedFrame body(spdy_util_.ConstructSpdyDataFrame(1, true));
MockRead reads[] = {
CreateMockRead(resp, 1), CreateMockRead(body, 2),
@@ -574,7 +574,7 @@ TEST_F(SpdyNetworkTransactionTest, Get) {
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunToCompletion(&data);
TransactionHelperResult out = helper.output();
EXPECT_THAT(out.rv, IsOk());
@@ -632,7 +632,8 @@ TEST_F(SpdyNetworkTransactionTest, GetAtEachPriority) {
arraysize(writes));
HttpRequestInfo http_req = CreateGetRequest();
- NormalSpdyTransactionHelper helper(http_req, p, NetLogWithSource(), NULL);
+ NormalSpdyTransactionHelper helper(http_req, p, NetLogWithSource(),
+ nullptr);
helper.RunToCompletion(&data);
TransactionHelperResult out = helper.output();
EXPECT_THAT(out.rv, IsOk());
@@ -654,19 +655,19 @@ TEST_F(SpdyNetworkTransactionTest, GetAtEachPriority) {
TEST_F(SpdyNetworkTransactionTest, ThreeGets) {
SpdySerializedFrame req(
spdy_util_.ConstructSpdyGet(nullptr, 0, 1, LOWEST, true));
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
SpdySerializedFrame body(spdy_util_.ConstructSpdyDataFrame(1, false));
SpdySerializedFrame fbody(spdy_util_.ConstructSpdyDataFrame(1, true));
SpdySerializedFrame req2(
spdy_util_.ConstructSpdyGet(nullptr, 0, 3, LOWEST, true));
- SpdySerializedFrame resp2(spdy_util_.ConstructSpdyGetReply(NULL, 0, 3));
+ SpdySerializedFrame resp2(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 3));
SpdySerializedFrame body2(spdy_util_.ConstructSpdyDataFrame(3, false));
SpdySerializedFrame fbody2(spdy_util_.ConstructSpdyDataFrame(3, true));
SpdySerializedFrame req3(
spdy_util_.ConstructSpdyGet(nullptr, 0, 5, LOWEST, true));
- SpdySerializedFrame resp3(spdy_util_.ConstructSpdyGetReply(NULL, 0, 5));
+ SpdySerializedFrame resp3(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 5));
SpdySerializedFrame body3(spdy_util_.ConstructSpdyDataFrame(5, false));
SpdySerializedFrame fbody3(spdy_util_.ConstructSpdyDataFrame(5, true));
@@ -685,13 +686,13 @@ TEST_F(SpdyNetworkTransactionTest, ThreeGets) {
MockRead(ASYNC, 0, 12), // EOF
};
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
- SequencedSocketData data_placeholder1(NULL, 0, NULL, 0);
- SequencedSocketData data_placeholder2(NULL, 0, NULL, 0);
+ SequencedSocketData data_placeholder1(nullptr, 0, nullptr, 0);
+ SequencedSocketData data_placeholder2(nullptr, 0, nullptr, 0);
NetLogWithSource log;
TransactionHelperResult out;
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunPreTestSetup();
helper.AddData(&data);
// We require placeholder data because three get requests are sent out at
@@ -743,13 +744,13 @@ TEST_F(SpdyNetworkTransactionTest, ThreeGets) {
TEST_F(SpdyNetworkTransactionTest, TwoGetsLateBinding) {
SpdySerializedFrame req(
spdy_util_.ConstructSpdyGet(nullptr, 0, 1, LOWEST, true));
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
SpdySerializedFrame body(spdy_util_.ConstructSpdyDataFrame(1, false));
SpdySerializedFrame fbody(spdy_util_.ConstructSpdyDataFrame(1, true));
SpdySerializedFrame req2(
spdy_util_.ConstructSpdyGet(nullptr, 0, 3, LOWEST, true));
- SpdySerializedFrame resp2(spdy_util_.ConstructSpdyGetReply(NULL, 0, 3));
+ SpdySerializedFrame resp2(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 3));
SpdySerializedFrame body2(spdy_util_.ConstructSpdyDataFrame(3, false));
SpdySerializedFrame fbody2(spdy_util_.ConstructSpdyDataFrame(3, true));
@@ -765,13 +766,13 @@ TEST_F(SpdyNetworkTransactionTest, TwoGetsLateBinding) {
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
MockConnect never_finishing_connect(SYNCHRONOUS, ERR_IO_PENDING);
- SequencedSocketData data_placeholder(NULL, 0, NULL, 0);
+ SequencedSocketData data_placeholder(nullptr, 0, nullptr, 0);
data_placeholder.set_connect_data(never_finishing_connect);
NetLogWithSource log;
TransactionHelperResult out;
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunPreTestSetup();
helper.AddData(&data);
// We require placeholder data because two requests are sent out at
@@ -823,13 +824,13 @@ TEST_F(SpdyNetworkTransactionTest, TwoGetsLateBinding) {
TEST_F(SpdyNetworkTransactionTest, TwoGetsLateBindingFromPreconnect) {
SpdySerializedFrame req(
spdy_util_.ConstructSpdyGet(nullptr, 0, 1, LOWEST, true));
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
SpdySerializedFrame body(spdy_util_.ConstructSpdyDataFrame(1, false));
SpdySerializedFrame fbody(spdy_util_.ConstructSpdyDataFrame(1, true));
SpdySerializedFrame req2(
spdy_util_.ConstructSpdyGet(nullptr, 0, 3, LOWEST, true));
- SpdySerializedFrame resp2(spdy_util_.ConstructSpdyGetReply(NULL, 0, 3));
+ SpdySerializedFrame resp2(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 3));
SpdySerializedFrame body2(spdy_util_.ConstructSpdyDataFrame(3, false));
SpdySerializedFrame fbody2(spdy_util_.ConstructSpdyDataFrame(3, true));
@@ -847,13 +848,13 @@ TEST_F(SpdyNetworkTransactionTest, TwoGetsLateBindingFromPreconnect) {
MockConnect never_finishing_connect(ASYNC, ERR_IO_PENDING);
- SequencedSocketData data_placeholder(NULL, 0, NULL, 0);
+ SequencedSocketData data_placeholder(nullptr, 0, nullptr, 0);
data_placeholder.set_connect_data(never_finishing_connect);
NetLogWithSource log;
TransactionHelperResult out;
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunPreTestSetup();
helper.AddData(&preconnect_data);
// We require placeholder data because 3 connections are attempted (first is
@@ -918,21 +919,21 @@ TEST_F(SpdyNetworkTransactionTest, ThreeGetsWithMaxConcurrent) {
// Each request fully completes before the next starts.
SpdySerializedFrame req(
spdy_util_.ConstructSpdyGet(nullptr, 0, 1, LOWEST, true));
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
SpdySerializedFrame body(spdy_util_.ConstructSpdyDataFrame(1, false));
SpdySerializedFrame fbody(spdy_util_.ConstructSpdyDataFrame(1, true));
spdy_util_.UpdateWithStreamDestruction(1);
SpdySerializedFrame req2(
spdy_util_.ConstructSpdyGet(nullptr, 0, 3, LOWEST, true));
- SpdySerializedFrame resp2(spdy_util_.ConstructSpdyGetReply(NULL, 0, 3));
+ SpdySerializedFrame resp2(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 3));
SpdySerializedFrame body2(spdy_util_.ConstructSpdyDataFrame(3, false));
SpdySerializedFrame fbody2(spdy_util_.ConstructSpdyDataFrame(3, true));
spdy_util_.UpdateWithStreamDestruction(3);
SpdySerializedFrame req3(
spdy_util_.ConstructSpdyGet(nullptr, 0, 5, LOWEST, true));
- SpdySerializedFrame resp3(spdy_util_.ConstructSpdyGetReply(NULL, 0, 5));
+ SpdySerializedFrame resp3(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 5));
SpdySerializedFrame body3(spdy_util_.ConstructSpdyDataFrame(5, false));
SpdySerializedFrame fbody3(spdy_util_.ConstructSpdyDataFrame(5, true));
@@ -969,7 +970,7 @@ TEST_F(SpdyNetworkTransactionTest, ThreeGetsWithMaxConcurrent) {
TransactionHelperResult out;
{
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunPreTestSetup();
helper.AddData(&data);
HttpNetworkTransaction trans1(DEFAULT_PRIORITY, helper.session());
@@ -1042,27 +1043,27 @@ TEST_F(SpdyNetworkTransactionTest, FourGetsWithMaxConcurrentPriority) {
// Construct the request.
SpdySerializedFrame req(
spdy_util_.ConstructSpdyGet(nullptr, 0, 1, LOWEST, true));
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
SpdySerializedFrame body(spdy_util_.ConstructSpdyDataFrame(1, false));
SpdySerializedFrame fbody(spdy_util_.ConstructSpdyDataFrame(1, true));
spdy_util_.UpdateWithStreamDestruction(1);
SpdySerializedFrame req2(
spdy_util_.ConstructSpdyGet(nullptr, 0, 3, LOWEST, true));
- SpdySerializedFrame resp2(spdy_util_.ConstructSpdyGetReply(NULL, 0, 3));
+ SpdySerializedFrame resp2(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 3));
SpdySerializedFrame body2(spdy_util_.ConstructSpdyDataFrame(3, false));
SpdySerializedFrame fbody2(spdy_util_.ConstructSpdyDataFrame(3, true));
spdy_util_.UpdateWithStreamDestruction(3);
SpdySerializedFrame req4(
spdy_util_.ConstructSpdyGet(nullptr, 0, 5, HIGHEST, true));
- SpdySerializedFrame resp4(spdy_util_.ConstructSpdyGetReply(NULL, 0, 5));
+ SpdySerializedFrame resp4(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 5));
SpdySerializedFrame fbody4(spdy_util_.ConstructSpdyDataFrame(5, true));
spdy_util_.UpdateWithStreamDestruction(5);
SpdySerializedFrame req3(
spdy_util_.ConstructSpdyGet(nullptr, 0, 7, LOWEST, true));
- SpdySerializedFrame resp3(spdy_util_.ConstructSpdyGetReply(NULL, 0, 7));
+ SpdySerializedFrame resp3(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 7));
SpdySerializedFrame body3(spdy_util_.ConstructSpdyDataFrame(7, false));
SpdySerializedFrame fbody3(spdy_util_.ConstructSpdyDataFrame(7, true));
@@ -1101,7 +1102,7 @@ TEST_F(SpdyNetworkTransactionTest, FourGetsWithMaxConcurrentPriority) {
NetLogWithSource log;
TransactionHelperResult out;
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunPreTestSetup();
helper.AddData(&data);
@@ -1191,14 +1192,14 @@ TEST_F(SpdyNetworkTransactionTest, ThreeGetsWithMaxConcurrentDelete) {
// Construct the request.
SpdySerializedFrame req(
spdy_util_.ConstructSpdyGet(nullptr, 0, 1, LOWEST, true));
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
SpdySerializedFrame body(spdy_util_.ConstructSpdyDataFrame(1, false));
SpdySerializedFrame fbody(spdy_util_.ConstructSpdyDataFrame(1, true));
spdy_util_.UpdateWithStreamDestruction(1);
SpdySerializedFrame req2(
spdy_util_.ConstructSpdyGet(nullptr, 0, 3, LOWEST, true));
- SpdySerializedFrame resp2(spdy_util_.ConstructSpdyGetReply(NULL, 0, 3));
+ SpdySerializedFrame resp2(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 3));
SpdySerializedFrame body2(spdy_util_.ConstructSpdyDataFrame(3, false));
SpdySerializedFrame fbody2(spdy_util_.ConstructSpdyDataFrame(3, true));
@@ -1225,7 +1226,7 @@ TEST_F(SpdyNetworkTransactionTest, ThreeGetsWithMaxConcurrentDelete) {
NetLogWithSource log;
TransactionHelperResult out;
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunPreTestSetup();
helper.AddData(&data);
std::unique_ptr<HttpNetworkTransaction> trans1(
@@ -1317,14 +1318,14 @@ TEST_F(SpdyNetworkTransactionTest, ThreeGetsWithMaxConcurrentSocketClose) {
// Construct the request.
SpdySerializedFrame req(
spdy_util_.ConstructSpdyGet(nullptr, 0, 1, LOWEST, true));
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
SpdySerializedFrame body(spdy_util_.ConstructSpdyDataFrame(1, false));
SpdySerializedFrame fin_body(spdy_util_.ConstructSpdyDataFrame(1, true));
spdy_util_.UpdateWithStreamDestruction(1);
SpdySerializedFrame req2(
spdy_util_.ConstructSpdyGet(nullptr, 0, 3, LOWEST, true));
- SpdySerializedFrame resp2(spdy_util_.ConstructSpdyGetReply(NULL, 0, 3));
+ SpdySerializedFrame resp2(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 3));
SettingsMap settings;
const uint32_t max_concurrent_streams = 1;
@@ -1347,12 +1348,12 @@ TEST_F(SpdyNetworkTransactionTest, ThreeGetsWithMaxConcurrentSocketClose) {
};
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
- SequencedSocketData data_placeholder(NULL, 0, NULL, 0);
+ SequencedSocketData data_placeholder(nullptr, 0, nullptr, 0);
NetLogWithSource log;
TransactionHelperResult out;
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunPreTestSetup();
helper.AddData(&data);
// We require placeholder data because three get requests are sent out, so
@@ -1419,7 +1420,7 @@ TEST_F(SpdyNetworkTransactionTest, Put) {
CreateMockWrite(req, 0),
};
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
SpdySerializedFrame body(spdy_util_.ConstructSpdyDataFrame(1, true));
MockRead reads[] = {
CreateMockRead(resp, 1), CreateMockRead(body, 2),
@@ -1428,7 +1429,7 @@ TEST_F(SpdyNetworkTransactionTest, Put) {
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(request, DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunToCompletion(&data);
TransactionHelperResult out = helper.output();
@@ -1451,7 +1452,7 @@ TEST_F(SpdyNetworkTransactionTest, Head) {
CreateMockWrite(req, 0),
};
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
SpdySerializedFrame body(spdy_util_.ConstructSpdyDataFrame(1, true));
MockRead reads[] = {
CreateMockRead(resp, 1), CreateMockRead(body, 2),
@@ -1460,7 +1461,7 @@ TEST_F(SpdyNetworkTransactionTest, Head) {
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(request, DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunToCompletion(&data);
TransactionHelperResult out = helper.output();
@@ -1471,13 +1472,13 @@ TEST_F(SpdyNetworkTransactionTest, Head) {
// Test that a simple POST works.
TEST_F(SpdyNetworkTransactionTest, Post) {
SpdySerializedFrame req(spdy_util_.ConstructSpdyPost(
- kDefaultUrl, 1, kUploadDataSize, LOWEST, NULL, 0));
+ kDefaultUrl, 1, kUploadDataSize, LOWEST, nullptr, 0));
SpdySerializedFrame body(spdy_util_.ConstructSpdyDataFrame(1, true));
MockWrite writes[] = {
CreateMockWrite(req, 0), CreateMockWrite(body, 1), // POST upload frame
};
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyPostReply(NULL, 0));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyPostReply(nullptr, 0));
MockRead reads[] = {
CreateMockRead(resp, 2), CreateMockRead(body, 3),
MockRead(ASYNC, 0, 4) // EOF
@@ -1485,7 +1486,7 @@ TEST_F(SpdyNetworkTransactionTest, Post) {
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(CreatePostRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunToCompletion(&data);
TransactionHelperResult out = helper.output();
EXPECT_THAT(out.rv, IsOk());
@@ -1496,13 +1497,13 @@ TEST_F(SpdyNetworkTransactionTest, Post) {
// Test that a POST with a file works.
TEST_F(SpdyNetworkTransactionTest, FilePost) {
SpdySerializedFrame req(spdy_util_.ConstructSpdyPost(
- kDefaultUrl, 1, kUploadDataSize, LOWEST, NULL, 0));
+ kDefaultUrl, 1, kUploadDataSize, LOWEST, nullptr, 0));
SpdySerializedFrame body(spdy_util_.ConstructSpdyDataFrame(1, true));
MockWrite writes[] = {
CreateMockWrite(req, 0), CreateMockWrite(body, 1), // POST upload frame
};
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyPostReply(NULL, 0));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyPostReply(nullptr, 0));
MockRead reads[] = {
CreateMockRead(resp, 2), CreateMockRead(body, 3),
MockRead(ASYNC, 0, 4) // EOF
@@ -1510,7 +1511,7 @@ TEST_F(SpdyNetworkTransactionTest, FilePost) {
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(CreateFilePostRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunToCompletion(&data);
TransactionHelperResult out = helper.output();
EXPECT_THAT(out.rv, IsOk());
@@ -1530,7 +1531,7 @@ TEST_F(SpdyNetworkTransactionTest, UnreadableFilePost) {
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(CreateUnreadableFilePostRequest(),
DEFAULT_PRIORITY, NetLogWithSource(),
- NULL);
+ nullptr);
helper.RunPreTestSetup();
helper.AddData(&data);
helper.RunDefaultTest();
@@ -1543,21 +1544,22 @@ TEST_F(SpdyNetworkTransactionTest, UnreadableFilePost) {
// Test that a complex POST works.
TEST_F(SpdyNetworkTransactionTest, ComplexPost) {
SpdySerializedFrame req(spdy_util_.ConstructSpdyPost(
- kDefaultUrl, 1, kUploadDataSize, LOWEST, NULL, 0));
+ kDefaultUrl, 1, kUploadDataSize, LOWEST, nullptr, 0));
SpdySerializedFrame body(spdy_util_.ConstructSpdyDataFrame(1, true));
MockWrite writes[] = {
CreateMockWrite(req, 0), CreateMockWrite(body, 1), // POST upload frame
};
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyPostReply(NULL, 0));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyPostReply(nullptr, 0));
MockRead reads[] = {
CreateMockRead(resp, 2), CreateMockRead(body, 3),
MockRead(ASYNC, 0, 4) // EOF
};
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
- NormalSpdyTransactionHelper helper(
- CreateComplexPostRequest(), DEFAULT_PRIORITY, NetLogWithSource(), NULL);
+ NormalSpdyTransactionHelper helper(CreateComplexPostRequest(),
+ DEFAULT_PRIORITY, NetLogWithSource(),
+ nullptr);
helper.RunToCompletion(&data);
TransactionHelperResult out = helper.output();
EXPECT_THAT(out.rv, IsOk());
@@ -1567,21 +1569,22 @@ TEST_F(SpdyNetworkTransactionTest, ComplexPost) {
// Test that a chunked POST works.
TEST_F(SpdyNetworkTransactionTest, ChunkedPost) {
- SpdySerializedFrame req(spdy_util_.ConstructChunkedSpdyPost(NULL, 0));
+ SpdySerializedFrame req(spdy_util_.ConstructChunkedSpdyPost(nullptr, 0));
SpdySerializedFrame body(spdy_util_.ConstructSpdyDataFrame(1, true));
MockWrite writes[] = {
CreateMockWrite(req, 0), CreateMockWrite(body, 1),
};
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyPostReply(NULL, 0));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyPostReply(nullptr, 0));
MockRead reads[] = {
CreateMockRead(resp, 2), CreateMockRead(body, 3),
MockRead(ASYNC, 0, 4) // EOF
};
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
- NormalSpdyTransactionHelper helper(
- CreateChunkedPostRequest(), DEFAULT_PRIORITY, NetLogWithSource(), NULL);
+ NormalSpdyTransactionHelper helper(CreateChunkedPostRequest(),
+ DEFAULT_PRIORITY, NetLogWithSource(),
+ nullptr);
// These chunks get merged into a single frame when being sent.
const int kFirstChunkSize = kUploadDataSize/2;
@@ -1598,7 +1601,7 @@ TEST_F(SpdyNetworkTransactionTest, ChunkedPost) {
// Test that a chunked POST works with chunks appended after transaction starts.
TEST_F(SpdyNetworkTransactionTest, DelayedChunkedPost) {
- SpdySerializedFrame req(spdy_util_.ConstructChunkedSpdyPost(NULL, 0));
+ SpdySerializedFrame req(spdy_util_.ConstructChunkedSpdyPost(nullptr, 0));
SpdySerializedFrame chunk1(spdy_util_.ConstructSpdyDataFrame(1, false));
SpdySerializedFrame chunk2(spdy_util_.ConstructSpdyDataFrame(1, false));
SpdySerializedFrame chunk3(spdy_util_.ConstructSpdyDataFrame(1, true));
@@ -1607,7 +1610,7 @@ TEST_F(SpdyNetworkTransactionTest, DelayedChunkedPost) {
CreateMockWrite(chunk2, 2), CreateMockWrite(chunk3, 3),
};
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyPostReply(NULL, 0));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyPostReply(nullptr, 0));
MockRead reads[] = {
CreateMockRead(resp, 4), CreateMockRead(chunk1, 5),
CreateMockRead(chunk2, 6), CreateMockRead(chunk3, 7),
@@ -1615,8 +1618,9 @@ TEST_F(SpdyNetworkTransactionTest, DelayedChunkedPost) {
};
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
- NormalSpdyTransactionHelper helper(
- CreateChunkedPostRequest(), DEFAULT_PRIORITY, NetLogWithSource(), NULL);
+ NormalSpdyTransactionHelper helper(CreateChunkedPostRequest(),
+ DEFAULT_PRIORITY, NetLogWithSource(),
+ nullptr);
upload_chunked_data_stream()->AppendData(kUploadData, kUploadDataSize, false);
@@ -1650,7 +1654,7 @@ TEST_F(SpdyNetworkTransactionTest, NullPost) {
request.method = "POST";
request.url = default_url_;
// Create an empty UploadData.
- request.upload_data_stream = NULL;
+ request.upload_data_stream = nullptr;
// When request.upload_data_stream is NULL for post, content-length is
// expected to be 0.
@@ -1663,7 +1667,7 @@ TEST_F(SpdyNetworkTransactionTest, NullPost) {
CreateMockWrite(req, 0),
};
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyPostReply(NULL, 0));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyPostReply(nullptr, 0));
SpdySerializedFrame body(spdy_util_.ConstructSpdyDataFrame(1, true));
MockRead reads[] = {
CreateMockRead(resp, 1), CreateMockRead(body, 2),
@@ -1673,7 +1677,7 @@ TEST_F(SpdyNetworkTransactionTest, NullPost) {
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(request, DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunToCompletion(&data);
TransactionHelperResult out = helper.output();
EXPECT_THAT(out.rv, IsOk());
@@ -1704,7 +1708,7 @@ TEST_F(SpdyNetworkTransactionTest, EmptyPost) {
CreateMockWrite(req, 0),
};
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyPostReply(NULL, 0));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyPostReply(nullptr, 0));
SpdySerializedFrame body(spdy_util_.ConstructSpdyDataFrame(1, true));
MockRead reads[] = {
CreateMockRead(resp, 1), CreateMockRead(body, 2),
@@ -1714,7 +1718,7 @@ TEST_F(SpdyNetworkTransactionTest, EmptyPost) {
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(request, DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunToCompletion(&data);
TransactionHelperResult out = helper.output();
EXPECT_THAT(out.rv, IsOk());
@@ -1724,12 +1728,12 @@ TEST_F(SpdyNetworkTransactionTest, EmptyPost) {
// While we're doing a post, the server sends the reply before upload completes.
TEST_F(SpdyNetworkTransactionTest, ResponseBeforePostCompletes) {
- SpdySerializedFrame req(spdy_util_.ConstructChunkedSpdyPost(NULL, 0));
+ SpdySerializedFrame req(spdy_util_.ConstructChunkedSpdyPost(nullptr, 0));
SpdySerializedFrame body(spdy_util_.ConstructSpdyDataFrame(1, true));
MockWrite writes[] = {
CreateMockWrite(req, 0), CreateMockWrite(body, 3),
};
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyPostReply(NULL, 0));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyPostReply(nullptr, 0));
MockRead reads[] = {
CreateMockRead(resp, 1), CreateMockRead(body, 2),
MockRead(ASYNC, 0, 4) // EOF
@@ -1738,8 +1742,9 @@ TEST_F(SpdyNetworkTransactionTest, ResponseBeforePostCompletes) {
// Write the request headers, and read the complete response
// while still waiting for chunked request data.
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
- NormalSpdyTransactionHelper helper(
- CreateChunkedPostRequest(), DEFAULT_PRIORITY, NetLogWithSource(), NULL);
+ NormalSpdyTransactionHelper helper(CreateChunkedPostRequest(),
+ DEFAULT_PRIORITY, NetLogWithSource(),
+ nullptr);
helper.RunPreTestSetup();
helper.AddData(&data);
@@ -1779,14 +1784,14 @@ TEST_F(SpdyNetworkTransactionTest, SocketWriteReturnsZero) {
CreateMockWrite(rst, 3, SYNCHRONOUS),
};
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
MockRead reads[] = {
CreateMockRead(resp, 1, ASYNC), MockRead(ASYNC, 0, 0, 4) // EOF
};
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunPreTestSetup();
helper.AddData(&data);
helper.StartDefaultTest();
@@ -1817,7 +1822,7 @@ TEST_F(SpdyNetworkTransactionTest, ResponseWithoutHeaders) {
};
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunToCompletion(&data);
TransactionHelperResult out = helper.output();
EXPECT_THAT(out.rv, IsError(ERR_SPDY_PROTOCOL_ERROR));
@@ -1845,7 +1850,7 @@ TEST_F(SpdyNetworkTransactionTest, ResponseWithTwoSynReplies) {
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunPreTestSetup();
helper.AddData(&data);
@@ -1891,7 +1896,7 @@ TEST_F(SpdyNetworkTransactionTest, ResetReplyWithTransferEncoding) {
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunToCompletion(&data);
TransactionHelperResult out = helper.output();
EXPECT_THAT(out.rv, IsError(ERR_SPDY_PROTOCOL_ERROR));
@@ -1904,13 +1909,16 @@ TEST_F(SpdyNetworkTransactionTest, ResetPushWithTransferEncoding) {
// Construct the request.
SpdySerializedFrame req(
spdy_util_.ConstructSpdyGet(nullptr, 0, 1, LOWEST, true));
+ SpdySerializedFrame priority(
+ spdy_util_.ConstructSpdyPriority(2, 1, IDLE, true));
SpdySerializedFrame rst(
spdy_util_.ConstructSpdyRstStream(2, RST_STREAM_PROTOCOL_ERROR));
MockWrite writes[] = {
- CreateMockWrite(req, 0), CreateMockWrite(rst, 4),
+ CreateMockWrite(req, 0), CreateMockWrite(priority, 3),
+ CreateMockWrite(rst, 5),
};
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
const char* const headers[] = {
"transfer-encoding", "chunked"
};
@@ -1919,13 +1927,13 @@ TEST_F(SpdyNetworkTransactionTest, ResetPushWithTransferEncoding) {
GetDefaultUrlWithPath("/1").c_str()));
SpdySerializedFrame body(spdy_util_.ConstructSpdyDataFrame(1, true));
MockRead reads[] = {
- CreateMockRead(resp, 1), CreateMockRead(push, 2), CreateMockRead(body, 3),
- MockRead(ASYNC, 0, 5) // EOF
+ CreateMockRead(resp, 1), CreateMockRead(push, 2), CreateMockRead(body, 4),
+ MockRead(ASYNC, 0, 6) // EOF
};
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunToCompletion(&data);
TransactionHelperResult out = helper.output();
EXPECT_THAT(out.rv, IsOk());
@@ -1944,7 +1952,7 @@ TEST_F(SpdyNetworkTransactionTest, CancelledTransaction) {
CreateMockWrite(req),
};
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
MockRead reads[] = {
CreateMockRead(resp),
// This following read isn't used by the test, except during the
@@ -1958,7 +1966,7 @@ TEST_F(SpdyNetworkTransactionTest, CancelledTransaction) {
writes, arraysize(writes));
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunPreTestSetup();
helper.AddData(&data);
HttpNetworkTransaction* trans = helper.trans();
@@ -1986,7 +1994,7 @@ TEST_F(SpdyNetworkTransactionTest, CancelledTransactionSendRst) {
CreateMockWrite(rst, 2, SYNCHRONOUS),
};
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
MockRead reads[] = {
CreateMockRead(resp, 1, ASYNC), MockRead(ASYNC, 0, 0, 3) // EOF
};
@@ -1994,7 +2002,7 @@ TEST_F(SpdyNetworkTransactionTest, CancelledTransactionSendRst) {
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunPreTestSetup();
helper.AddData(&data);
HttpNetworkTransaction* trans = helper.trans();
@@ -2029,7 +2037,7 @@ TEST_F(SpdyNetworkTransactionTest, StartTransactionOnReadCallback) {
0x07, 'h', 'e', 'l', 'l', 'o', '!',
};
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
MockRead reads[] = {
CreateMockRead(resp, 1),
MockRead(ASYNC, ERR_IO_PENDING, 2), // Force a pause
@@ -2047,7 +2055,7 @@ TEST_F(SpdyNetworkTransactionTest, StartTransactionOnReadCallback) {
arraysize(writes2));
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunPreTestSetup();
helper.AddData(&data);
helper.AddData(&data2);
@@ -2085,7 +2093,7 @@ TEST_F(SpdyNetworkTransactionTest, DeleteSessionOnReadCallback) {
spdy_util_.ConstructSpdyGet(nullptr, 0, 1, LOWEST, true));
MockWrite writes[] = {CreateMockWrite(req, 0)};
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
SpdySerializedFrame body(spdy_util_.ConstructSpdyDataFrame(1, true));
MockRead reads[] = {
CreateMockRead(resp, 1),
@@ -2096,7 +2104,7 @@ TEST_F(SpdyNetworkTransactionTest, DeleteSessionOnReadCallback) {
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunPreTestSetup();
helper.AddData(&data);
HttpNetworkTransaction* trans = helper.trans();
@@ -2182,8 +2190,10 @@ TEST_F(SpdyNetworkTransactionTest,
SpdySerializedFrame req(
spdy_util_.ConstructSpdyHeaders(1, std::move(headers), LOWEST, true));
+ SpdySerializedFrame priority(
+ spdy_util_.ConstructSpdyPriority(2, 1, IDLE, true));
MockWrite writes[] = {
- CreateMockWrite(req, 0),
+ CreateMockWrite(req, 0), CreateMockWrite(priority, 2),
};
SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
@@ -2204,7 +2214,7 @@ TEST_F(SpdyNetworkTransactionTest,
2, "should not include either", 25, false));
MockRead push_init_read(CreateMockRead(push_init_frame, 1));
- MockRead response_headers(CreateMockRead(resp, 4));
+ MockRead response_headers(CreateMockRead(resp, 5));
// raw_header_size() will contain the size of the push promise frame
// initialization.
int expected_response_headers_size =
@@ -2212,11 +2222,11 @@ TEST_F(SpdyNetworkTransactionTest,
MockRead reads[] = {
push_init_read,
- CreateMockRead(push_headers_frame, 2),
- CreateMockRead(push_body_frame, 3),
+ CreateMockRead(push_headers_frame, 3),
+ CreateMockRead(push_body_frame, 4),
response_headers,
- CreateMockRead(response_body_frame, 5),
- MockRead(ASYNC, 0, 6) // EOF
+ CreateMockRead(response_body_frame, 6),
+ MockRead(ASYNC, 0, 7) // EOF
};
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
@@ -2276,7 +2286,7 @@ TEST_F(SpdyNetworkTransactionTest, DISABLED_RedirectGetRequest) {
CreateMockWrite(req2, 1),
};
- SpdySerializedFrame resp2(spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ SpdySerializedFrame resp2(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
SpdySerializedFrame body2(spdy_util_.ConstructSpdyDataFrame(1, true));
MockRead reads2[] = {
CreateMockRead(resp2, 2), CreateMockRead(body2, 3),
@@ -2327,9 +2337,9 @@ TEST_F(SpdyNetworkTransactionTest, DISABLED_RedirectServerPush) {
// Setup writes/reads to www.example.org
SpdySerializedFrame req(
spdy_util_.ConstructSpdyHeaders(1, std::move(headers), LOWEST, true));
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
SpdySerializedFrame rep(spdy_util_.ConstructSpdyPush(
- NULL, 0, 2, 1, GetDefaultUrlWithPath("/foo.dat").c_str(),
+ nullptr, 0, 2, 1, GetDefaultUrlWithPath("/foo.dat").c_str(),
"301 Moved Permanently", "http://www.foo.com/index.php"));
SpdySerializedFrame body(spdy_util_.ConstructSpdyDataFrame(1, true));
SpdySerializedFrame rst(
@@ -2350,7 +2360,7 @@ TEST_F(SpdyNetworkTransactionTest, DISABLED_RedirectServerPush) {
headers2["accept-encoding"] = "gzip, deflate";
SpdySerializedFrame req2(
spdy_util_.ConstructSpdyHeaders(1, std::move(headers2), LOWEST, true));
- SpdySerializedFrame resp2(spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ SpdySerializedFrame resp2(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
SpdySerializedFrame body2(spdy_util_.ConstructSpdyDataFrame(1, true));
MockWrite writes2[] = {
CreateMockWrite(req2, 1),
@@ -2406,24 +2416,24 @@ TEST_F(SpdyNetworkTransactionTest, DISABLED_RedirectServerPush) {
TEST_F(SpdyNetworkTransactionTest, ServerPushSingleDataFrame) {
SpdySerializedFrame stream1_syn(
spdy_util_.ConstructSpdyGet(nullptr, 0, 1, LOWEST, true));
- SpdySerializedFrame stream1_body(spdy_util_.ConstructSpdyDataFrame(1, true));
+ SpdySerializedFrame stream2_priority(
+ spdy_util_.ConstructSpdyPriority(2, 1, IDLE, true));
MockWrite writes[] = {
- CreateMockWrite(stream1_syn, 0),
+ CreateMockWrite(stream1_syn, 0), CreateMockWrite(stream2_priority, 3),
};
SpdySerializedFrame stream1_reply(
- spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
SpdySerializedFrame stream2_syn(spdy_util_.ConstructSpdyPush(
- NULL, 0, 2, 1, GetDefaultUrlWithPath("/foo.dat").c_str()));
+ nullptr, 0, 2, 1, GetDefaultUrlWithPath("/foo.dat").c_str()));
+ SpdySerializedFrame stream1_body(spdy_util_.ConstructSpdyDataFrame(1, true));
const char kPushedData[] = "pushed";
SpdySerializedFrame stream2_body(spdy_util_.ConstructSpdyDataFrame(
2, kPushedData, strlen(kPushedData), true));
MockRead reads[] = {
- CreateMockRead(stream1_reply, 1),
- CreateMockRead(stream2_syn, 2),
- CreateMockRead(stream1_body, 3, SYNCHRONOUS),
- CreateMockRead(stream2_body, 4),
- MockRead(SYNCHRONOUS, ERR_IO_PENDING, 5), // Force a pause
+ CreateMockRead(stream1_reply, 1), CreateMockRead(stream2_syn, 2),
+ CreateMockRead(stream1_body, 4), CreateMockRead(stream2_body, 5),
+ MockRead(SYNCHRONOUS, ERR_IO_PENDING, 6), // Force a pause
};
HttpResponseInfo response;
@@ -2447,24 +2457,26 @@ TEST_F(SpdyNetworkTransactionTest, ServerPushSingleDataFrame) {
TEST_F(SpdyNetworkTransactionTest, ServerPushBeforeHeaders) {
SpdySerializedFrame stream1_syn(
spdy_util_.ConstructSpdyGet(nullptr, 0, 1, LOWEST, true));
+ SpdySerializedFrame stream2_priority(
+ spdy_util_.ConstructSpdyPriority(2, 1, IDLE, true));
MockWrite writes[] = {
- CreateMockWrite(stream1_syn, 0),
+ CreateMockWrite(stream1_syn, 0), CreateMockWrite(stream2_priority, 2),
};
SpdySerializedFrame stream2_syn(spdy_util_.ConstructSpdyPush(
nullptr, 0, 2, 1, GetDefaultUrlWithPath("/foo.dat").c_str()));
SpdySerializedFrame stream1_reply(
- spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
SpdySerializedFrame stream1_body(spdy_util_.ConstructSpdyDataFrame(1, true));
const char kPushedData[] = "pushed";
SpdySerializedFrame stream2_body(spdy_util_.ConstructSpdyDataFrame(
2, kPushedData, strlen(kPushedData), true));
MockRead reads[] = {
CreateMockRead(stream2_syn, 1),
- CreateMockRead(stream1_reply, 2),
- CreateMockRead(stream1_body, 3, SYNCHRONOUS),
- CreateMockRead(stream2_body, 4),
- MockRead(SYNCHRONOUS, ERR_IO_PENDING, 5), // Force a pause
+ CreateMockRead(stream1_reply, 3),
+ CreateMockRead(stream1_body, 4, SYNCHRONOUS),
+ CreateMockRead(stream2_body, 5),
+ MockRead(SYNCHRONOUS, ERR_IO_PENDING, 6), // Force a pause
};
HttpResponseInfo response;
@@ -2488,14 +2500,16 @@ TEST_F(SpdyNetworkTransactionTest, ServerPushBeforeHeaders) {
TEST_F(SpdyNetworkTransactionTest, ServerPushSingleDataFrame2) {
SpdySerializedFrame stream1_syn(
spdy_util_.ConstructSpdyGet(nullptr, 0, 1, LOWEST, true));
+ SpdySerializedFrame stream2_priority(
+ spdy_util_.ConstructSpdyPriority(2, 1, IDLE, true));
MockWrite writes[] = {
- CreateMockWrite(stream1_syn, 0),
+ CreateMockWrite(stream1_syn, 0), CreateMockWrite(stream2_priority, 3),
};
SpdySerializedFrame stream1_reply(
- spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
SpdySerializedFrame stream2_syn(spdy_util_.ConstructSpdyPush(
- NULL, 0, 2, 1, GetDefaultUrlWithPath("/foo.dat").c_str()));
+ nullptr, 0, 2, 1, GetDefaultUrlWithPath("/foo.dat").c_str()));
const char kPushedData[] = "pushed";
SpdySerializedFrame stream2_body(spdy_util_.ConstructSpdyDataFrame(
2, kPushedData, strlen(kPushedData), true));
@@ -2503,9 +2517,9 @@ TEST_F(SpdyNetworkTransactionTest, ServerPushSingleDataFrame2) {
MockRead reads[] = {
CreateMockRead(stream1_reply, 1),
CreateMockRead(stream2_syn, 2),
- CreateMockRead(stream2_body, 3),
- CreateMockRead(stream1_body, 4, SYNCHRONOUS),
- MockRead(SYNCHRONOUS, ERR_IO_PENDING, 5), // Force a pause
+ CreateMockRead(stream2_body, 4),
+ CreateMockRead(stream1_body, 5, SYNCHRONOUS),
+ MockRead(SYNCHRONOUS, ERR_IO_PENDING, 6), // Force a pause
};
HttpResponseInfo response;
@@ -2526,31 +2540,141 @@ TEST_F(SpdyNetworkTransactionTest, ServerPushSingleDataFrame2) {
EXPECT_EQ("HTTP/1.1 200", response2.headers->GetStatusLine());
}
+TEST_F(SpdyNetworkTransactionTest, ServerPushUpdatesPriority) {
+ SpdySerializedFrame stream1_headers(
+ spdy_util_.ConstructSpdyGet(nullptr, 0, 1, HIGHEST, true));
+ SpdySerializedFrame stream3_headers(
+ spdy_util_.ConstructSpdyGet(nullptr, 0, 3, MEDIUM, true));
+ SpdySerializedFrame stream5_headers(
+ spdy_util_.ConstructSpdyGet(nullptr, 0, 5, MEDIUM, true));
+
+ // Stream 1 pushes two streams that are initially prioritized below stream 5.
+ // Stream 2 is later prioritized below stream 1 after it matches a request.
+ SpdySerializedFrame stream2_priority(
+ spdy_util_.ConstructSpdyPriority(2, 5, IDLE, true));
+ SpdySerializedFrame stream4_priority(
+ spdy_util_.ConstructSpdyPriority(4, 2, IDLE, true));
+ SpdySerializedFrame stream4_priority_update(
+ spdy_util_.ConstructSpdyPriority(4, 5, IDLE, true));
+ SpdySerializedFrame stream2_priority_update(
+ spdy_util_.ConstructSpdyPriority(2, 1, HIGHEST, true));
+
+ MockWrite writes[] = {
+ CreateMockWrite(stream1_headers, 0),
+ CreateMockWrite(stream3_headers, 1),
+ CreateMockWrite(stream5_headers, 2),
+ CreateMockWrite(stream2_priority, 7),
+ CreateMockWrite(stream4_priority, 9),
+ CreateMockWrite(stream4_priority_update, 11),
+ CreateMockWrite(stream2_priority_update, 12),
+ };
+
+ SpdySerializedFrame stream1_reply(
+ spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
+ SpdySerializedFrame stream3_reply(
+ spdy_util_.ConstructSpdyGetReply(nullptr, 0, 3));
+ SpdySerializedFrame stream5_reply(
+ spdy_util_.ConstructSpdyGetReply(nullptr, 0, 5));
+
+ SpdySerializedFrame stream2_push(spdy_util_.ConstructSpdyPush(
+ nullptr, 0, 2, 1, GetDefaultUrlWithPath("/foo.dat").c_str()));
+ SpdySerializedFrame stream4_push(spdy_util_.ConstructSpdyPush(
+ nullptr, 0, 4, 1, GetDefaultUrlWithPath("/bar.dat").c_str()));
+
+ SpdySerializedFrame stream1_body(spdy_util_.ConstructSpdyDataFrame(1, true));
+ SpdySerializedFrame stream2_body(spdy_util_.ConstructSpdyDataFrame(2, true));
+ SpdySerializedFrame stream3_body(spdy_util_.ConstructSpdyDataFrame(3, true));
+ SpdySerializedFrame stream5_body(spdy_util_.ConstructSpdyDataFrame(5, true));
+
+ MockRead reads[] = {
+ CreateMockRead(stream1_reply, 3),
+ CreateMockRead(stream3_reply, 4),
+ CreateMockRead(stream5_reply, 5),
+ CreateMockRead(stream2_push, 6),
+ CreateMockRead(stream4_push, 8),
+ MockRead(ASYNC, ERR_IO_PENDING, 10),
+ CreateMockRead(stream1_body, 13),
+ CreateMockRead(stream2_body, 14),
+ CreateMockRead(stream3_body, 15),
+ CreateMockRead(stream5_body, 16),
+ MockRead(SYNCHRONOUS, ERR_IO_PENDING, 17), // Force a pause
+ };
+
+ SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
+ SequencedSocketData data_placeholder1(nullptr, 0, nullptr, 0);
+ SequencedSocketData data_placeholder2(nullptr, 0, nullptr, 0);
+ SequencedSocketData data_placeholder3(nullptr, 0, nullptr, 0);
+
+ NormalSpdyTransactionHelper helper(CreateGetRequest(), LOWEST,
+ NetLogWithSource(), nullptr);
+ helper.RunPreTestSetup();
+ helper.AddData(&data);
+ helper.AddData(&data_placeholder1); // other requests reuse the same socket
+ helper.AddData(&data_placeholder2);
+ helper.AddData(&data_placeholder3);
+ HttpNetworkTransaction trans1(HIGHEST, helper.session());
+ HttpNetworkTransaction trans3(MEDIUM, helper.session());
+ HttpNetworkTransaction trans5(MEDIUM, helper.session());
+
+ TestCompletionCallback callback1;
+ TestCompletionCallback callback3;
+ TestCompletionCallback callback5;
+
+ // Start the ordinary requests.
+ NetLogWithSource log;
+ ASSERT_THAT(trans1.Start(&CreateGetRequest(), callback1.callback(), log),
+ IsError(ERR_IO_PENDING));
+ ASSERT_THAT(trans3.Start(&CreateGetRequest(), callback3.callback(), log),
+ IsError(ERR_IO_PENDING));
+ ASSERT_THAT(trans5.Start(&CreateGetRequest(), callback5.callback(), log),
+ IsError(ERR_IO_PENDING));
+ data.RunUntilPaused();
+
+ HttpNetworkTransaction trans2(HIGHEST, helper.session());
+ TestCompletionCallback callback2;
+
+ // Start a request that matches the push.
+ HttpRequestInfo push_req = CreateGetRequest();
+ push_req.url = GURL(GetDefaultUrlWithPath("/foo.dat"));
+ ASSERT_THAT(trans2.Start(&push_req, callback2.callback(), log),
+ IsError(ERR_IO_PENDING));
+ data.Resume();
+
+ base::RunLoop().RunUntilIdle();
+ ASSERT_THAT(callback1.WaitForResult(), IsOk());
+ ASSERT_THAT(callback2.WaitForResult(), IsOk());
+ ASSERT_THAT(callback3.WaitForResult(), IsOk());
+ ASSERT_THAT(callback5.WaitForResult(), IsOk());
+ helper.VerifyDataConsumed();
+}
+
TEST_F(SpdyNetworkTransactionTest, ServerPushServerAborted) {
SpdySerializedFrame stream1_syn(
spdy_util_.ConstructSpdyGet(nullptr, 0, 1, LOWEST, true));
- SpdySerializedFrame stream1_body(spdy_util_.ConstructSpdyDataFrame(1, true));
+ SpdySerializedFrame stream2_priority(
+ spdy_util_.ConstructSpdyPriority(2, 1, IDLE, true));
MockWrite writes[] = {
- CreateMockWrite(stream1_syn, 0),
+ CreateMockWrite(stream1_syn, 0), CreateMockWrite(stream2_priority, 3),
};
SpdySerializedFrame stream1_reply(
- spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
SpdySerializedFrame stream2_syn(spdy_util_.ConstructSpdyPush(
- NULL, 0, 2, 1, GetDefaultUrlWithPath("/foo.dat").c_str()));
+ nullptr, 0, 2, 1, GetDefaultUrlWithPath("/foo.dat").c_str()));
SpdySerializedFrame stream2_rst(
spdy_util_.ConstructSpdyRstStream(2, RST_STREAM_PROTOCOL_ERROR));
+ SpdySerializedFrame stream1_body(spdy_util_.ConstructSpdyDataFrame(1, true));
MockRead reads[] = {
CreateMockRead(stream1_reply, 1),
CreateMockRead(stream2_syn, 2, SYNCHRONOUS),
- CreateMockRead(stream2_rst, 3, SYNCHRONOUS),
- CreateMockRead(stream1_body, 4, SYNCHRONOUS),
- MockRead(SYNCHRONOUS, ERR_IO_PENDING, 5), // Force a pause
+ CreateMockRead(stream2_rst, 4),
+ CreateMockRead(stream1_body, 5, SYNCHRONOUS),
+ MockRead(SYNCHRONOUS, ERR_IO_PENDING, 6), // Force a pause
};
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunPreTestSetup();
helper.AddData(&data);
@@ -2566,6 +2690,7 @@ TEST_F(SpdyNetworkTransactionTest, ServerPushServerAborted) {
EXPECT_THAT(rv, IsOk());
// Verify that we consumed all test data.
+ base::RunLoop().RunUntilIdle();
EXPECT_TRUE(data.AllReadDataConsumed());
EXPECT_TRUE(data.AllWriteDataConsumed());
@@ -2580,29 +2705,34 @@ TEST_F(SpdyNetworkTransactionTest, ServerPushServerAborted) {
TEST_F(SpdyNetworkTransactionTest, ServerPushDuplicate) {
SpdySerializedFrame stream1_syn(
spdy_util_.ConstructSpdyGet(nullptr, 0, 1, LOWEST, true));
- SpdySerializedFrame stream1_body(spdy_util_.ConstructSpdyDataFrame(1, true));
+ SpdySerializedFrame stream2_priority(
+ spdy_util_.ConstructSpdyPriority(2, 1, IDLE, true));
SpdySerializedFrame stream3_rst(
spdy_util_.ConstructSpdyRstStream(4, RST_STREAM_PROTOCOL_ERROR));
MockWrite writes[] = {
- CreateMockWrite(stream1_syn, 0), CreateMockWrite(stream3_rst, 4),
+ CreateMockWrite(stream1_syn, 0), CreateMockWrite(stream2_priority, 3),
+ CreateMockWrite(stream3_rst, 5),
};
SpdySerializedFrame stream1_reply(
- spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
SpdySerializedFrame stream2_syn(spdy_util_.ConstructSpdyPush(
- NULL, 0, 2, 1, GetDefaultUrlWithPath("/foo.dat").c_str()));
+ nullptr, 0, 2, 1, GetDefaultUrlWithPath("/foo.dat").c_str()));
+ SpdySerializedFrame stream3_syn(spdy_util_.ConstructSpdyPush(
+ nullptr, 0, 4, 1, GetDefaultUrlWithPath("/foo.dat").c_str()));
+
const char kPushedData[] = "pushed";
+ SpdySerializedFrame stream1_body(spdy_util_.ConstructSpdyDataFrame(1, true));
SpdySerializedFrame stream2_body(spdy_util_.ConstructSpdyDataFrame(
2, kPushedData, strlen(kPushedData), true));
- SpdySerializedFrame stream3_syn(spdy_util_.ConstructSpdyPush(
- NULL, 0, 4, 1, GetDefaultUrlWithPath("/foo.dat").c_str()));
+
MockRead reads[] = {
CreateMockRead(stream1_reply, 1),
CreateMockRead(stream2_syn, 2),
- CreateMockRead(stream3_syn, 3),
- CreateMockRead(stream1_body, 5),
- CreateMockRead(stream2_body, 6),
- MockRead(SYNCHRONOUS, ERR_IO_PENDING, 7), // Force a pause
+ CreateMockRead(stream3_syn, 4),
+ CreateMockRead(stream1_body, 6),
+ CreateMockRead(stream2_body, 7),
+ MockRead(SYNCHRONOUS, ERR_IO_PENDING, 8), // Force a pause
};
HttpResponseInfo response;
@@ -2626,15 +2756,16 @@ TEST_F(SpdyNetworkTransactionTest, ServerPushDuplicate) {
TEST_F(SpdyNetworkTransactionTest, ServerPushMultipleDataFrame) {
SpdySerializedFrame stream1_syn(
spdy_util_.ConstructSpdyGet(nullptr, 0, 1, LOWEST, true));
- SpdySerializedFrame stream1_body(spdy_util_.ConstructSpdyDataFrame(1, true));
+ SpdySerializedFrame stream2_priority(
+ spdy_util_.ConstructSpdyPriority(2, 1, IDLE, true));
MockWrite writes[] = {
- CreateMockWrite(stream1_syn, 0),
+ CreateMockWrite(stream1_syn, 0), CreateMockWrite(stream2_priority, 3),
};
SpdySerializedFrame stream1_reply(
- spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
SpdySerializedFrame stream2_syn(spdy_util_.ConstructSpdyPush(
- NULL, 0, 2, 1, GetDefaultUrlWithPath("/foo.dat").c_str()));
+ nullptr, 0, 2, 1, GetDefaultUrlWithPath("/foo.dat").c_str()));
static const char kPushedData[] = "pushed my darling hello my baby";
SpdySerializedFrame stream2_body_base(spdy_util_.ConstructSpdyDataFrame(
2, kPushedData, strlen(kPushedData), true));
@@ -2648,15 +2779,16 @@ TEST_F(SpdyNetworkTransactionTest, ServerPushMultipleDataFrame) {
SpdySerializedFrame stream2_body4(stream2_body_base.data() + 3 * kChunkSize,
stream2_body_base.size() - 3 * kChunkSize,
false);
+ SpdySerializedFrame stream1_body(spdy_util_.ConstructSpdyDataFrame(1, true));
MockRead reads[] = {
CreateMockRead(stream1_reply, 1),
CreateMockRead(stream2_syn, 2),
- CreateMockRead(stream2_body1, 3),
- CreateMockRead(stream2_body2, 4),
- CreateMockRead(stream2_body3, 5),
- CreateMockRead(stream2_body4, 6),
- CreateMockRead(stream1_body, 7, SYNCHRONOUS),
- MockRead(SYNCHRONOUS, ERR_IO_PENDING, 8), // Force a pause
+ CreateMockRead(stream2_body1, 4),
+ CreateMockRead(stream2_body2, 5),
+ CreateMockRead(stream2_body3, 6),
+ CreateMockRead(stream2_body4, 7),
+ CreateMockRead(stream1_body, 8, SYNCHRONOUS),
+ MockRead(SYNCHRONOUS, ERR_IO_PENDING, 9), // Force a pause
};
HttpResponseInfo response;
@@ -2677,15 +2809,16 @@ TEST_F(SpdyNetworkTransactionTest, ServerPushMultipleDataFrame) {
TEST_F(SpdyNetworkTransactionTest, ServerPushMultipleDataFrameInterrupted) {
SpdySerializedFrame stream1_syn(
spdy_util_.ConstructSpdyGet(nullptr, 0, 1, LOWEST, true));
- SpdySerializedFrame stream1_body(spdy_util_.ConstructSpdyDataFrame(1, true));
+ SpdySerializedFrame stream2_priority(
+ spdy_util_.ConstructSpdyPriority(2, 1, IDLE, true));
MockWrite writes[] = {
- CreateMockWrite(stream1_syn, 0),
+ CreateMockWrite(stream1_syn, 0), CreateMockWrite(stream2_priority, 3),
};
SpdySerializedFrame stream1_reply(
- spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
SpdySerializedFrame stream2_syn(spdy_util_.ConstructSpdyPush(
- NULL, 0, 2, 1, GetDefaultUrlWithPath("/foo.dat").c_str()));
+ nullptr, 0, 2, 1, GetDefaultUrlWithPath("/foo.dat").c_str()));
static const char kPushedData[] = "pushed my darling hello my baby";
SpdySerializedFrame stream2_body_base(spdy_util_.ConstructSpdyDataFrame(
2, kPushedData, strlen(kPushedData), true));
@@ -2699,15 +2832,16 @@ TEST_F(SpdyNetworkTransactionTest, ServerPushMultipleDataFrameInterrupted) {
SpdySerializedFrame stream2_body4(stream2_body_base.data() + 3 * kChunkSize,
stream2_body_base.size() - 3 * kChunkSize,
false);
+ SpdySerializedFrame stream1_body(spdy_util_.ConstructSpdyDataFrame(1, true));
MockRead reads[] = {
CreateMockRead(stream1_reply, 1),
CreateMockRead(stream2_syn, 2),
- CreateMockRead(stream2_body1, 3),
- CreateMockRead(stream2_body2, 4),
- CreateMockRead(stream2_body3, 5),
- CreateMockRead(stream2_body4, 6),
- CreateMockRead(stream1_body, 7, SYNCHRONOUS),
- MockRead(SYNCHRONOUS, ERR_IO_PENDING, 8) // Force a pause.
+ CreateMockRead(stream2_body1, 4),
+ CreateMockRead(stream2_body2, 5),
+ CreateMockRead(stream2_body3, 6),
+ CreateMockRead(stream2_body4, 7),
+ CreateMockRead(stream1_body, 8, SYNCHRONOUS),
+ MockRead(SYNCHRONOUS, ERR_IO_PENDING, 9) // Force a pause.
};
HttpResponseInfo response;
@@ -2734,16 +2868,16 @@ TEST_F(SpdyNetworkTransactionTest, ServerPushInvalidAssociatedStreamID0) {
};
SpdySerializedFrame stream1_reply(
- spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
SpdySerializedFrame stream2_syn(spdy_util_.ConstructSpdyPush(
- NULL, 0, 2, 0, GetDefaultUrlWithPath("/foo.dat").c_str()));
+ nullptr, 0, 2, 0, GetDefaultUrlWithPath("/foo.dat").c_str()));
MockRead reads[] = {
CreateMockRead(stream1_reply, 1), CreateMockRead(stream2_syn, 2),
};
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunPreTestSetup();
helper.AddData(&data);
@@ -2782,9 +2916,9 @@ TEST_F(SpdyNetworkTransactionTest, ServerPushInvalidAssociatedStreamID9) {
};
SpdySerializedFrame stream1_reply(
- spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
SpdySerializedFrame stream2_syn(spdy_util_.ConstructSpdyPush(
- NULL, 0, 2, 9, GetDefaultUrlWithPath("/foo.dat").c_str()));
+ nullptr, 0, 2, 9, GetDefaultUrlWithPath("/foo.dat").c_str()));
MockRead reads[] = {
CreateMockRead(stream1_reply, 1), CreateMockRead(stream2_syn, 2),
CreateMockRead(stream1_body, 4),
@@ -2793,7 +2927,7 @@ TEST_F(SpdyNetworkTransactionTest, ServerPushInvalidAssociatedStreamID9) {
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunPreTestSetup();
helper.AddData(&data);
@@ -2832,7 +2966,7 @@ TEST_F(SpdyNetworkTransactionTest, ServerPushNoURL) {
};
SpdySerializedFrame stream1_reply(
- spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
SpdyHeaderBlock incomplete_headers;
incomplete_headers[spdy_util_.GetStatusKey()] = "200 OK";
incomplete_headers["hello"] = "bye";
@@ -2846,7 +2980,7 @@ TEST_F(SpdyNetworkTransactionTest, ServerPushNoURL) {
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunPreTestSetup();
helper.AddData(&data);
@@ -2878,21 +3012,24 @@ TEST_F(SpdyNetworkTransactionTest, ServerPushNoURL) {
TEST_F(SpdyNetworkTransactionTest, ServerPushOnPushedStream) {
SpdySerializedFrame stream1_syn(
spdy_util_.ConstructSpdyGet(nullptr, 0, 1, LOWEST, true));
+ SpdySerializedFrame stream2_priority(
+ spdy_util_.ConstructSpdyPriority(2, 1, IDLE, true));
SpdySerializedFrame goaway(spdy_util_.ConstructSpdyGoAway(
2, GOAWAY_PROTOCOL_ERROR, "Push on even stream id."));
MockWrite writes[] = {
- CreateMockWrite(stream1_syn, 0), CreateMockWrite(goaway, 4),
+ CreateMockWrite(stream1_syn, 0), CreateMockWrite(stream2_priority, 3),
+ CreateMockWrite(goaway, 5),
};
SpdySerializedFrame stream1_reply(
- spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
SpdySerializedFrame stream2_syn(spdy_util_.ConstructSpdyPush(
nullptr, 0, 2, 1, GetDefaultUrlWithPath("/foo.dat").c_str()));
SpdySerializedFrame stream3_syn(spdy_util_.ConstructSpdyPush(
nullptr, 0, 4, 2, GetDefaultUrlWithPath("/bar.dat").c_str()));
MockRead reads[] = {
CreateMockRead(stream1_reply, 1), CreateMockRead(stream2_syn, 2),
- CreateMockRead(stream3_syn, 3),
+ CreateMockRead(stream3_syn, 4),
};
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
@@ -2952,10 +3089,13 @@ TEST_F(SpdyNetworkTransactionTest, ServerPushOnClosedStream) {
TEST_F(SpdyNetworkTransactionTest, ServerPushOnClosedPushedStream) {
SpdySerializedFrame stream1_syn(
spdy_util_.ConstructSpdyGet(nullptr, 0, 1, LOWEST, true));
+ SpdySerializedFrame stream2_priority(
+ spdy_util_.ConstructSpdyPriority(2, 1, IDLE, true));
SpdySerializedFrame goaway(spdy_util_.ConstructSpdyGoAway(
2, GOAWAY_PROTOCOL_ERROR, "Push on even stream id."));
MockWrite writes[] = {
- CreateMockWrite(stream1_syn, 0), CreateMockWrite(goaway, 7),
+ CreateMockWrite(stream1_syn, 0), CreateMockWrite(stream2_priority, 3),
+ CreateMockWrite(goaway, 8),
};
SpdySerializedFrame stream1_reply(
@@ -2971,8 +3111,8 @@ TEST_F(SpdyNetworkTransactionTest, ServerPushOnClosedPushedStream) {
MockRead reads[] = {
CreateMockRead(stream1_reply, 1), CreateMockRead(stream2_syn, 2),
- CreateMockRead(stream1_body, 3), CreateMockRead(stream2_body, 4),
- MockRead(ASYNC, ERR_IO_PENDING, 5), CreateMockRead(stream3_syn, 6),
+ CreateMockRead(stream1_body, 4), CreateMockRead(stream2_body, 5),
+ MockRead(ASYNC, ERR_IO_PENDING, 6), CreateMockRead(stream3_syn, 7),
};
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
@@ -3017,25 +3157,21 @@ TEST_F(SpdyNetworkTransactionTest, ResponseHeaders) {
int num_headers;
const char* extra_headers[5];
SpdyHeaderBlock expected_headers;
- } test_cases[] = {
- // This uses a multi-valued cookie header.
- { 2,
- { "cookie", "val1",
- "cookie", "val2", // will get appended separated by NULL
- NULL
- },
- },
- // This is the minimalist set of headers.
- { 0,
- { NULL },
- },
- // Headers with a comma separated list.
- { 1,
- { "cookie", "val1,val2",
- NULL
- },
- }
- };
+ } test_cases[] = {// This uses a multi-valued cookie header.
+ {
+ 2,
+ {"cookie", "val1", "cookie",
+ "val2", // will get appended separated by nullptr
+ nullptr},
+ },
+ // This is the minimalist set of headers.
+ {
+ 0, {nullptr},
+ },
+ // Headers with a comma separated list.
+ {
+ 1, {"cookie", "val1,val2", nullptr},
+ }};
test_cases[0].expected_headers["status"] = "200";
test_cases[1].expected_headers["status"] = "200";
@@ -3065,7 +3201,7 @@ TEST_F(SpdyNetworkTransactionTest, ResponseHeaders) {
SequencedSocketData data(reads, arraysize(reads), writes,
arraysize(writes));
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunToCompletion(&data);
TransactionHelperResult out = helper.output();
@@ -3106,27 +3242,27 @@ TEST_F(SpdyNetworkTransactionTest, ResponseHeadersVary) {
// with NUL characters, it needs to be unfolded into multiple headers.
{true,
{1, 3},
- {{"cookie", "val1,val2", NULL},
+ {{"cookie", "val1,val2", nullptr},
{spdy_util_.GetStatusKey(), "200", spdy_util_.GetPathKey(),
- "/index.php", "vary", "cookie", NULL}}},
+ "/index.php", "vary", "cookie", nullptr}}},
{// Multiple vary fields.
true,
{2, 4},
- {{"friend", "barney", "enemy", "snaggletooth", NULL},
+ {{"friend", "barney", "enemy", "snaggletooth", nullptr},
{spdy_util_.GetStatusKey(), "200", spdy_util_.GetPathKey(),
- "/index.php", "vary", "friend", "vary", "enemy", NULL}}},
+ "/index.php", "vary", "friend", "vary", "enemy", nullptr}}},
{// Test a '*' vary field.
false,
{1, 3},
- {{"cookie", "val1,val2", NULL},
+ {{"cookie", "val1,val2", nullptr},
{spdy_util_.GetStatusKey(), "200", spdy_util_.GetPathKey(),
- "/index.php", "vary", "*", NULL}}},
+ "/index.php", "vary", "*", nullptr}}},
{// Multiple comma-separated vary fields.
true,
{2, 3},
- {{"friend", "barney", "enemy", "snaggletooth", NULL},
+ {{"friend", "barney", "enemy", "snaggletooth", nullptr},
{spdy_util_.GetStatusKey(), "200", spdy_util_.GetPathKey(),
- "/index.php", "vary", "friend,enemy", NULL}}}};
+ "/index.php", "vary", "friend,enemy", nullptr}}}};
for (size_t i = 0; i < arraysize(test_cases); ++i) {
SpdyTestUtil spdy_test_util;
@@ -3171,7 +3307,7 @@ TEST_F(SpdyNetworkTransactionTest, ResponseHeadersVary) {
SequencedSocketData data(reads, arraysize(reads), writes,
arraysize(writes));
NormalSpdyTransactionHelper helper(request, DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunToCompletion(&data);
TransactionHelperResult out = helper.output();
@@ -3209,15 +3345,15 @@ TEST_F(SpdyNetworkTransactionTest, InvalidResponseHeaders) {
{
3,
{spdy_util_.GetPathKey(), "/index.php", "cookie", "val1", "cookie",
- "val2", NULL},
+ "val2", nullptr},
},
// Response headers missing version header
{
- 1, {spdy_util_.GetPathKey(), "/index.php", "status", "200", NULL},
+ 1, {spdy_util_.GetPathKey(), "/index.php", "status", "200", nullptr},
},
// Response headers with no headers
{
- 0, {NULL},
+ 0, {nullptr},
},
};
@@ -3245,7 +3381,7 @@ TEST_F(SpdyNetworkTransactionTest, InvalidResponseHeaders) {
SequencedSocketData data(reads, arraysize(reads), writes,
arraysize(writes));
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunToCompletion(&data);
TransactionHelperResult out = helper.output();
EXPECT_THAT(out.rv, IsError(ERR_SPDY_PROTOCOL_ERROR));
@@ -3273,7 +3409,7 @@ TEST_F(SpdyNetworkTransactionTest, CorruptFrameSessionError) {
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunToCompletion(&data);
TransactionHelperResult out = helper.output();
EXPECT_THAT(out.rv, IsError(ERR_SPDY_COMPRESSION_ERROR));
@@ -3287,13 +3423,13 @@ TEST_F(SpdyNetworkTransactionTest, GoAwayOnDecompressionFailure) {
MockWrite writes[] = {CreateMockWrite(req, 0), CreateMockWrite(goaway, 2)};
// Read HEADERS with corrupted payload.
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
memset(resp.data() + 12, 0xcf, resp.size() - 12);
MockRead reads[] = {CreateMockRead(resp, 1)};
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunToCompletion(&data);
TransactionHelperResult out = helper.output();
EXPECT_THAT(out.rv, IsError(ERR_SPDY_COMPRESSION_ERROR));
@@ -3315,7 +3451,7 @@ TEST_F(SpdyNetworkTransactionTest, GoAwayOnFrameSizeError) {
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunToCompletion(&data);
TransactionHelperResult out = helper.output();
EXPECT_THAT(out.rv, IsError(ERR_SPDY_FRAME_SIZE_ERROR));
@@ -3339,7 +3475,7 @@ TEST_F(SpdyNetworkTransactionTest, WriteError) {
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunPreTestSetup();
helper.AddData(&data);
EXPECT_TRUE(helper.StartDefaultTest());
@@ -3361,7 +3497,7 @@ TEST_F(SpdyNetworkTransactionTest, PartialWrite) {
writes[i].sequence_number = i;
}
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
SpdySerializedFrame body(spdy_util_.ConstructSpdyDataFrame(1, true));
MockRead reads[] = {
CreateMockRead(resp, kChunks), CreateMockRead(body, kChunks + 1),
@@ -3370,7 +3506,7 @@ TEST_F(SpdyNetworkTransactionTest, PartialWrite) {
SequencedSocketData data(reads, arraysize(reads), writes.get(), kChunks);
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunToCompletion(&data);
TransactionHelperResult out = helper.output();
EXPECT_THAT(out.rv, IsOk());
@@ -3387,7 +3523,7 @@ TEST_F(SpdyNetworkTransactionTest, NetLog) {
spdy_util_.ConstructSpdyGet(kExtraHeaders, 1, 1, LOWEST, true));
MockWrite writes[] = {CreateMockWrite(req, 0)};
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
SpdySerializedFrame body(spdy_util_.ConstructSpdyDataFrame(1, true));
MockRead reads[] = {
CreateMockRead(resp, 1), CreateMockRead(body, 2),
@@ -3398,7 +3534,7 @@ TEST_F(SpdyNetworkTransactionTest, NetLog) {
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(CreateGetRequestWithUserAgent(),
- DEFAULT_PRIORITY, log.bound(), NULL);
+ DEFAULT_PRIORITY, log.bound(), nullptr);
helper.RunToCompletion(&data);
TransactionHelperResult out = helper.output();
EXPECT_THAT(out.rv, IsOk());
@@ -3484,7 +3620,7 @@ TEST_F(SpdyNetworkTransactionTest, BufferFull) {
SpdySerializedFrame last_frame(
spdy_util_.ConstructSpdyDataFrame(1, "d", 1, /*fin=*/true));
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
MockRead reads[] = {
CreateMockRead(resp, 1),
MockRead(ASYNC, ERR_IO_PENDING, 2), // Force a pause
@@ -3499,7 +3635,7 @@ TEST_F(SpdyNetworkTransactionTest, BufferFull) {
TestCompletionCallback callback;
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunPreTestSetup();
helper.AddData(&data);
HttpNetworkTransaction* trans = helper.trans();
@@ -3571,7 +3707,7 @@ TEST_F(SpdyNetworkTransactionTest, Buffering) {
CombineFrames(data_frames, arraysize(data_frames),
combined_data_frames, arraysize(combined_data_frames));
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
MockRead reads[] = {
CreateMockRead(resp, 1),
MockRead(ASYNC, ERR_IO_PENDING, 2), // Force a pause
@@ -3582,7 +3718,7 @@ TEST_F(SpdyNetworkTransactionTest, Buffering) {
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunPreTestSetup();
helper.AddData(&data);
HttpNetworkTransaction* trans = helper.trans();
@@ -3648,7 +3784,7 @@ TEST_F(SpdyNetworkTransactionTest, BufferedAll) {
MockWrite writes[] = {CreateMockWrite(req, 0)};
// 5 data frames in a single read.
- SpdySerializedFrame reply(spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ SpdySerializedFrame reply(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
SpdySerializedFrame data_frame(
spdy_util_.ConstructSpdyDataFrame(1, "message", 7, /*fin=*/false));
SpdySerializedFrame data_frame_fin(
@@ -3668,7 +3804,7 @@ TEST_F(SpdyNetworkTransactionTest, BufferedAll) {
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunPreTestSetup();
helper.AddData(&data);
HttpNetworkTransaction* trans = helper.trans();
@@ -3739,7 +3875,7 @@ TEST_F(SpdyNetworkTransactionTest, BufferedClosed) {
int combined_data_frames_len =
CombineFrames(data_frames, arraysize(data_frames),
combined_data_frames, arraysize(combined_data_frames));
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
MockRead reads[] = {
CreateMockRead(resp, 1),
MockRead(ASYNC, ERR_IO_PENDING, 2), // Force a wait
@@ -3750,7 +3886,7 @@ TEST_F(SpdyNetworkTransactionTest, BufferedClosed) {
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunPreTestSetup();
helper.AddData(&data);
HttpNetworkTransaction* trans = helper.trans();
@@ -3819,7 +3955,7 @@ TEST_F(SpdyNetworkTransactionTest, BufferedCancelled) {
SpdySerializedFrame data_frame(
spdy_util_.ConstructSpdyDataFrame(1, "message", 7, /*fin=*/false));
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
MockRead reads[] = {
CreateMockRead(resp, 1),
MockRead(ASYNC, ERR_IO_PENDING, 2), // Force a wait
@@ -3829,7 +3965,7 @@ TEST_F(SpdyNetworkTransactionTest, BufferedCancelled) {
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunPreTestSetup();
helper.AddData(&data);
HttpNetworkTransaction* trans = helper.trans();
@@ -3884,7 +4020,7 @@ TEST_F(SpdyNetworkTransactionTest, GoAwayWithActiveStream) {
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.AddData(&data);
helper.RunToCompletion(&data);
TransactionHelperResult out = helper.output();
@@ -3896,7 +4032,7 @@ TEST_F(SpdyNetworkTransactionTest, CloseWithActiveStream) {
spdy_util_.ConstructSpdyGet(nullptr, 0, 1, LOWEST, true));
MockWrite writes[] = {CreateMockWrite(req, 0)};
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
MockRead reads[] = {
CreateMockRead(resp, 1), MockRead(SYNCHRONOUS, 0, 2) // EOF
};
@@ -3904,7 +4040,7 @@ TEST_F(SpdyNetworkTransactionTest, CloseWithActiveStream) {
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunPreTestSetup();
helper.AddData(&data);
helper.StartDefaultTest();
@@ -4110,7 +4246,7 @@ TEST_F(SpdyNetworkTransactionTest, ProxyConnect) {
const char kHTTP200[] = {"HTTP/1.1 200 OK\r\n\r\n"};
SpdySerializedFrame req(
spdy_util_.ConstructSpdyGet(nullptr, 0, 1, LOWEST, true));
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
SpdySerializedFrame body(spdy_util_.ConstructSpdyDataFrame(1, true));
MockWrite writes[] = {
@@ -4172,7 +4308,7 @@ TEST_F(SpdyNetworkTransactionTest, DirectConnectProxyReconnect) {
CreateMockWrite(req, 0),
};
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
SpdySerializedFrame body(spdy_util_.ConstructSpdyDataFrame(1, true));
MockRead reads[] = {
CreateMockRead(resp, 1), CreateMockRead(body, 2),
@@ -4222,7 +4358,7 @@ TEST_F(SpdyNetworkTransactionTest, DirectConnectProxyReconnect) {
const char kHTTP200[] = {"HTTP/1.1 200 OK\r\n\r\n"};
SpdySerializedFrame req2(spdy_util_2.ConstructSpdyGet(
GetDefaultUrlWithPath("/foo.dat").c_str(), 1, LOWEST));
- SpdySerializedFrame resp2(spdy_util_2.ConstructSpdyGetReply(NULL, 0, 1));
+ SpdySerializedFrame resp2(spdy_util_2.ConstructSpdyGetReply(nullptr, 0, 1));
SpdySerializedFrame body2(spdy_util_2.ConstructSpdyDataFrame(1, true));
MockWrite writes2[] = {
@@ -4275,7 +4411,7 @@ TEST_F(SpdyNetworkTransactionTest, DirectConnectProxyReconnect) {
// This can happen when a server reboots without saying goodbye, or when
// we're behind a NAT that masked the RST.
TEST_F(SpdyNetworkTransactionTest, VerifyRetryOnConnectionReset) {
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
SpdySerializedFrame body(spdy_util_.ConstructSpdyDataFrame(1, true));
MockRead reads[] = {
CreateMockRead(resp, 1), CreateMockRead(body, 2),
@@ -4316,7 +4452,7 @@ TEST_F(SpdyNetworkTransactionTest, VerifyRetryOnConnectionReset) {
arraysize(writes2));
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.AddData(&data1);
helper.AddData(&data2);
helper.RunPreTestSetup();
@@ -4389,8 +4525,10 @@ TEST_F(SpdyNetworkTransactionTest, SpdyBasicAuth) {
arraysize(kExtraAuthenticationHeaders) / 2, 1));
SpdySerializedFrame body_authentication(
spdy_util_.ConstructSpdyDataFrame(1, true));
- SpdySerializedFrame resp_data(spdy_util_.ConstructSpdyGetReply(NULL, 0, 3));
+ SpdySerializedFrame resp_data(
+ spdy_util_.ConstructSpdyGetReply(nullptr, 0, 3));
SpdySerializedFrame body_data(spdy_util_.ConstructSpdyDataFrame(3, true));
+
MockRead spdy_reads[] = {
CreateMockRead(resp_authentication, 1),
CreateMockRead(body_authentication, 2, SYNCHRONOUS),
@@ -4403,7 +4541,7 @@ TEST_F(SpdyNetworkTransactionTest, SpdyBasicAuth) {
arraysize(spdy_writes));
HttpRequestInfo request(CreateGetRequest());
NormalSpdyTransactionHelper helper(request, DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunPreTestSetup();
helper.AddData(&data);
@@ -4441,14 +4579,16 @@ TEST_F(SpdyNetworkTransactionTest, SpdyBasicAuth) {
ASSERT_TRUE(response_restart);
ASSERT_TRUE(response_restart->headers);
EXPECT_EQ(200, response_restart->headers->response_code());
- EXPECT_TRUE(response_restart->auth_challenge.get() == NULL);
+ EXPECT_TRUE(response_restart->auth_challenge.get() == nullptr);
}
TEST_F(SpdyNetworkTransactionTest, ServerPushWithHeaders) {
SpdySerializedFrame stream1_syn(
spdy_util_.ConstructSpdyGet(nullptr, 0, 1, LOWEST, true));
+ SpdySerializedFrame stream2_priority(
+ spdy_util_.ConstructSpdyPriority(2, 1, IDLE, true));
MockWrite writes[] = {
- CreateMockWrite(stream1_syn, 0),
+ CreateMockWrite(stream1_syn, 0), CreateMockWrite(stream2_priority, 3),
};
SpdySerializedFrame stream1_reply(
@@ -4475,10 +4615,10 @@ TEST_F(SpdyNetworkTransactionTest, ServerPushWithHeaders) {
MockRead reads[] = {
CreateMockRead(stream1_reply, 1),
CreateMockRead(stream2_syn, 2),
- CreateMockRead(stream2_headers, 3),
- CreateMockRead(stream1_body, 4, SYNCHRONOUS),
- CreateMockRead(stream2_body, 5),
- MockRead(SYNCHRONOUS, ERR_IO_PENDING, 6), // Force a pause
+ CreateMockRead(stream2_headers, 4),
+ CreateMockRead(stream1_body, 5, SYNCHRONOUS),
+ CreateMockRead(stream2_body, 6),
+ MockRead(SYNCHRONOUS, ERR_IO_PENDING, 7), // Force a pause
};
HttpResponseInfo response;
@@ -4503,8 +4643,11 @@ TEST_F(SpdyNetworkTransactionTest, ServerPushClaimBeforeHeaders) {
// We push a stream and attempt to claim it before the headers come down.
SpdySerializedFrame stream1_syn(
spdy_util_.ConstructSpdyGet(nullptr, 0, 1, LOWEST, true));
+ SpdySerializedFrame stream2_priority(
+ spdy_util_.ConstructSpdyPriority(2, 1, IDLE, true));
MockWrite writes[] = {
CreateMockWrite(stream1_syn, 0, SYNCHRONOUS),
+ CreateMockWrite(stream2_priority, 3),
};
SpdySerializedFrame stream1_reply(
@@ -4525,9 +4668,9 @@ TEST_F(SpdyNetworkTransactionTest, ServerPushClaimBeforeHeaders) {
2, kPushedData, strlen(kPushedData), true));
MockRead reads[] = {
CreateMockRead(stream1_reply, 1), CreateMockRead(stream2_syn, 2),
- CreateMockRead(stream1_body, 3), MockRead(ASYNC, ERR_IO_PENDING, 4),
- CreateMockRead(stream2_headers, 5), CreateMockRead(stream2_body, 6),
- MockRead(ASYNC, ERR_IO_PENDING, 7), MockRead(ASYNC, 0, 8), // EOF
+ CreateMockRead(stream1_body, 4), MockRead(ASYNC, ERR_IO_PENDING, 5),
+ CreateMockRead(stream2_headers, 6), CreateMockRead(stream2_body, 7),
+ MockRead(ASYNC, ERR_IO_PENDING, 8), MockRead(ASYNC, 0, 9), // EOF
};
HttpResponseInfo response;
@@ -4536,7 +4679,7 @@ TEST_F(SpdyNetworkTransactionTest, ServerPushClaimBeforeHeaders) {
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.AddData(&data);
helper.RunPreTestSetup();
@@ -4611,7 +4754,7 @@ TEST_F(SpdyNetworkTransactionTest, ResponseHeadersTwice) {
};
SpdySerializedFrame stream1_reply(
- spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
SpdyHeaderBlock late_headers;
late_headers["hello"] = "bye";
@@ -4625,7 +4768,7 @@ TEST_F(SpdyNetworkTransactionTest, ResponseHeadersTwice) {
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunToCompletion(&data);
TransactionHelperResult out = helper.output();
EXPECT_THAT(out.rv, IsError(ERR_SPDY_PROTOCOL_ERROR));
@@ -4644,7 +4787,7 @@ TEST_F(SpdyNetworkTransactionTest, SyncReplyDataAfterTrailers) {
};
SpdySerializedFrame stream1_reply(
- spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
SpdySerializedFrame stream1_body(spdy_util_.ConstructSpdyDataFrame(1, false));
SpdyHeaderBlock late_headers;
@@ -4660,7 +4803,7 @@ TEST_F(SpdyNetworkTransactionTest, SyncReplyDataAfterTrailers) {
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunToCompletion(&data);
TransactionHelperResult out = helper.output();
EXPECT_THAT(out.rv, IsError(ERR_SPDY_PROTOCOL_ERROR));
@@ -4783,8 +4926,10 @@ TEST_F(SpdyNetworkTransactionTest, ServerPushValidCrossOrigin) {
SpdySerializedFrame headers(
spdy_util_.ConstructSpdyGet(url_to_fetch, 1, LOWEST));
+ SpdySerializedFrame push_priority(
+ spdy_util_.ConstructSpdyPriority(2, 1, IDLE, true));
MockWrite writes[] = {
- CreateMockWrite(headers, 0),
+ CreateMockWrite(headers, 0), CreateMockWrite(push_priority, 3),
};
SpdySerializedFrame reply(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
@@ -4797,9 +4942,9 @@ TEST_F(SpdyNetworkTransactionTest, ServerPushValidCrossOrigin) {
MockRead reads[] = {
CreateMockRead(reply, 1),
CreateMockRead(push, 2, SYNCHRONOUS),
- CreateMockRead(body, 3, SYNCHRONOUS),
- CreateMockRead(pushed_body, 4, SYNCHRONOUS),
- MockRead(SYNCHRONOUS, ERR_IO_PENDING, 5),
+ CreateMockRead(body, 4),
+ CreateMockRead(pushed_body, 5, SYNCHRONOUS),
+ MockRead(SYNCHRONOUS, ERR_IO_PENDING, 6),
};
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
@@ -4844,9 +4989,6 @@ TEST_F(SpdyNetworkTransactionTest, ServerPushValidCrossOrigin) {
EXPECT_TRUE(spdy_session->unclaimed_pushed_streams_.empty());
EXPECT_EQ(0u, spdy_session->unclaimed_pushed_streams_.size());
- helper.VerifyDataConsumed();
- VerifyStreamsClosed(helper);
-
HttpResponseInfo response = *trans0->GetResponseInfo();
EXPECT_TRUE(response.headers);
EXPECT_EQ("HTTP/1.1 200", response.headers->GetStatusLine());
@@ -4862,6 +5004,10 @@ TEST_F(SpdyNetworkTransactionTest, ServerPushValidCrossOrigin) {
std::string result1;
ReadResult(&trans1, &result1);
EXPECT_EQ(kPushedData, result1);
+
+ base::RunLoop().RunUntilIdle();
+ helper.VerifyDataConsumed();
+ VerifyStreamsClosed(helper);
}
// Verify that push works cross origin, even if there is already a connection
@@ -4893,8 +5039,11 @@ TEST_F(SpdyNetworkTransactionTest, ServerPushValidCrossOriginWithOpenSession) {
SpdySerializedFrame headers1(
spdy_util_1.ConstructSpdyGet(url_to_fetch1, 1, LOWEST));
+ SpdySerializedFrame push_priority(
+ spdy_util_.ConstructSpdyPriority(2, 1, IDLE, true));
MockWrite writes1[] = {
CreateMockWrite(headers1, 0),
+ CreateMockWrite(push_priority, 3, SYNCHRONOUS),
};
SpdySerializedFrame reply1(spdy_util_1.ConstructSpdyGetReply(nullptr, 0, 1));
@@ -4910,9 +5059,9 @@ TEST_F(SpdyNetworkTransactionTest, ServerPushValidCrossOriginWithOpenSession) {
MockRead reads1[] = {
CreateMockRead(reply1, 1),
CreateMockRead(push, 2, SYNCHRONOUS),
- CreateMockRead(body1, 3, SYNCHRONOUS),
- CreateMockRead(pushed_body, 4, SYNCHRONOUS),
- MockRead(SYNCHRONOUS, ERR_IO_PENDING, 5),
+ CreateMockRead(body1, 4),
+ CreateMockRead(pushed_body, 5, SYNCHRONOUS),
+ MockRead(SYNCHRONOUS, ERR_IO_PENDING, 6),
};
SequencedSocketData data1(reads1, arraysize(reads1), writes1,
@@ -5000,9 +5149,6 @@ TEST_F(SpdyNetworkTransactionTest, ServerPushValidCrossOriginWithOpenSession) {
EXPECT_TRUE(spdy_session1->unclaimed_pushed_streams_.empty());
EXPECT_EQ(0u, spdy_session1->unclaimed_pushed_streams_.size());
- helper.VerifyDataConsumed();
- VerifyStreamsClosed(helper);
-
HttpResponseInfo response0 = *trans0->GetResponseInfo();
EXPECT_TRUE(response0.headers);
EXPECT_EQ("HTTP/1.1 200", response0.headers->GetStatusLine());
@@ -5026,6 +5172,10 @@ TEST_F(SpdyNetworkTransactionTest, ServerPushValidCrossOriginWithOpenSession) {
std::string result2;
ReadResult(&trans2, &result2);
EXPECT_EQ(kPushedData, result2);
+
+ base::RunLoop().RunUntilIdle();
+ helper.VerifyDataConsumed();
+ VerifyStreamsClosed(helper);
}
TEST_F(SpdyNetworkTransactionTest, ServerPushInvalidCrossOrigin) {
@@ -5051,9 +5201,9 @@ TEST_F(SpdyNetworkTransactionTest, ServerPushInvalidCrossOrigin) {
2, kPushedData, strlen(kPushedData), true));
MockRead reads[] = {
CreateMockRead(reply, 1),
- CreateMockRead(push, 2),
+ CreateMockRead(push, 2, SYNCHRONOUS),
CreateMockRead(body, 4),
- CreateMockRead(pushed_body, 5),
+ CreateMockRead(pushed_body, 5, SYNCHRONOUS),
MockRead(SYNCHRONOUS, ERR_IO_PENDING, 6),
};
@@ -5086,7 +5236,7 @@ TEST_F(SpdyNetworkTransactionTest, RetryAfterRefused) {
SpdySerializedFrame refused(
spdy_util_.ConstructSpdyRstStream(1, RST_STREAM_REFUSED_STREAM));
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(NULL, 0, 3));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 3));
SpdySerializedFrame body(spdy_util_.ConstructSpdyDataFrame(3, true));
MockRead reads[] = {
CreateMockRead(refused, 1), CreateMockRead(resp, 3),
@@ -5095,7 +5245,7 @@ TEST_F(SpdyNetworkTransactionTest, RetryAfterRefused) {
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunPreTestSetup();
helper.AddData(&data);
@@ -5152,11 +5302,11 @@ TEST_F(SpdyNetworkTransactionTest, OutOfOrderHeaders) {
CreateMockWrite(req2, 5), CreateMockWrite(req3, 6),
};
- SpdySerializedFrame resp1(spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ SpdySerializedFrame resp1(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
SpdySerializedFrame body1(spdy_util_.ConstructSpdyDataFrame(1, true));
- SpdySerializedFrame resp2(spdy_util_.ConstructSpdyGetReply(NULL, 0, 3));
+ SpdySerializedFrame resp2(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 3));
SpdySerializedFrame body2(spdy_util_.ConstructSpdyDataFrame(3, true));
- SpdySerializedFrame resp3(spdy_util_.ConstructSpdyGetReply(NULL, 0, 5));
+ SpdySerializedFrame resp3(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 5));
SpdySerializedFrame body3(spdy_util_.ConstructSpdyDataFrame(5, true));
MockRead reads[] = {
CreateMockRead(resp1, 2), MockRead(ASYNC, ERR_IO_PENDING, 3),
@@ -5167,7 +5317,7 @@ TEST_F(SpdyNetworkTransactionTest, OutOfOrderHeaders) {
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(CreateGetRequest(), LOWEST,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunPreTestSetup();
helper.AddData(&data);
@@ -5240,7 +5390,8 @@ TEST_F(SpdyNetworkTransactionTest, WindowUpdateReceived) {
std::unique_ptr<std::string> content(
new std::string(kMaxSpdyFrameChunkSize, 'a'));
SpdySerializedFrame req(spdy_util_.ConstructSpdyPost(
- kDefaultUrl, 1, kMaxSpdyFrameChunkSize * kFrameCount, LOWEST, NULL, 0));
+ kDefaultUrl, 1, kMaxSpdyFrameChunkSize * kFrameCount, LOWEST, nullptr,
+ 0));
SpdySerializedFrame body(spdy_util_.ConstructSpdyDataFrame(
1, content->c_str(), content->size(), false));
SpdySerializedFrame body_end(spdy_util_.ConstructSpdyDataFrame(
@@ -5257,7 +5408,7 @@ TEST_F(SpdyNetworkTransactionTest, WindowUpdateReceived) {
spdy_util_.ConstructSpdyWindowUpdate(1, kDeltaWindowSize));
SpdySerializedFrame window_update_dummy(
spdy_util_.ConstructSpdyWindowUpdate(2, kDeltaWindowSize));
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyPostReply(NULL, 0));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyPostReply(nullptr, 0));
MockRead reads[] = {
CreateMockRead(window_update_dummy, 3),
CreateMockRead(window_update_dummy, 4),
@@ -5288,7 +5439,7 @@ TEST_F(SpdyNetworkTransactionTest, WindowUpdateReceived) {
request.upload_data_stream = &upload_data_stream;
NormalSpdyTransactionHelper helper(request, DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.AddData(&data);
helper.RunPreTestSetup();
@@ -5376,7 +5527,7 @@ TEST_F(SpdyNetworkTransactionTest, WindowUpdateSent) {
writes.push_back(CreateMockWrite(req, writes.size()));
std::vector<MockRead> reads;
- SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(NULL, 0, 1));
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
reads.push_back(CreateMockRead(resp, writes.size() + reads.size()));
std::vector<SpdySerializedFrame> body_frames;
@@ -5466,7 +5617,8 @@ TEST_F(SpdyNetworkTransactionTest, WindowUpdateOverflow) {
std::unique_ptr<std::string> content(
new std::string(kMaxSpdyFrameChunkSize, 'a'));
SpdySerializedFrame req(spdy_util_.ConstructSpdyPost(
- kDefaultUrl, 1, kMaxSpdyFrameChunkSize * kFrameCount, LOWEST, NULL, 0));
+ kDefaultUrl, 1, kMaxSpdyFrameChunkSize * kFrameCount, LOWEST, nullptr,
+ 0));
SpdySerializedFrame body(spdy_util_.ConstructSpdyDataFrame(
1, content->c_str(), content->size(), false));
SpdySerializedFrame rst(
@@ -5502,7 +5654,7 @@ TEST_F(SpdyNetworkTransactionTest, WindowUpdateOverflow) {
request.upload_data_stream = &upload_data_stream;
NormalSpdyTransactionHelper helper(request, DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunPreTestSetup();
helper.AddData(&data);
HttpNetworkTransaction* trans = helper.trans();
@@ -5552,7 +5704,7 @@ TEST_F(SpdyNetworkTransactionTest, FlowControlStallResume) {
SpdySerializedFrame req(spdy_util_.ConstructSpdyPost(
kDefaultUrl, 1,
/*content_length=*/kBufferSize * num_upload_buffers + kUploadDataSize,
- LOWEST, NULL, 0));
+ LOWEST, nullptr, 0));
// Full frames.
SpdySerializedFrame body1(spdy_util_.ConstructSpdyDataFrame(
@@ -5619,7 +5771,7 @@ TEST_F(SpdyNetworkTransactionTest, FlowControlStallResume) {
writes.push_back(CreateMockWrite(body4, i++));
writes.push_back(CreateMockWrite(body5, i++));
- SpdySerializedFrame reply(spdy_util_.ConstructSpdyPostReply(NULL, 0));
+ SpdySerializedFrame reply(spdy_util_.ConstructSpdyPostReply(nullptr, 0));
reads.push_back(CreateMockRead(reply, i++));
reads.push_back(CreateMockRead(body2, i++));
reads.push_back(CreateMockRead(body5, i++));
@@ -5640,7 +5792,7 @@ TEST_F(SpdyNetworkTransactionTest, FlowControlStallResume) {
request.url = default_url_;
request.upload_data_stream = &upload_data_stream;
NormalSpdyTransactionHelper helper(request, DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.AddData(&data);
helper.RunPreTestSetup();
@@ -5702,7 +5854,7 @@ TEST_F(SpdyNetworkTransactionTest, FlowControlStallResumeAfterSettings) {
SpdySerializedFrame req(spdy_util_.ConstructSpdyPost(
kDefaultUrl, 1,
/*content_length=*/kBufferSize * num_upload_buffers + kUploadDataSize,
- LOWEST, NULL, 0));
+ LOWEST, nullptr, 0));
// Full frames.
SpdySerializedFrame body1(spdy_util_.ConstructSpdyDataFrame(
@@ -5776,7 +5928,7 @@ TEST_F(SpdyNetworkTransactionTest, FlowControlStallResumeAfterSettings) {
writes.push_back(CreateMockWrite(body4, i++));
writes.push_back(CreateMockWrite(body5, i++));
- SpdySerializedFrame reply(spdy_util_.ConstructSpdyPostReply(NULL, 0));
+ SpdySerializedFrame reply(spdy_util_.ConstructSpdyPostReply(nullptr, 0));
reads.push_back(CreateMockRead(reply, i++));
reads.push_back(CreateMockRead(body2, i++));
reads.push_back(CreateMockRead(body5, i++));
@@ -5799,7 +5951,7 @@ TEST_F(SpdyNetworkTransactionTest, FlowControlStallResumeAfterSettings) {
request.url = default_url_;
request.upload_data_stream = &upload_data_stream;
NormalSpdyTransactionHelper helper(request, DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunPreTestSetup();
helper.AddData(&data);
@@ -5839,8 +5991,8 @@ TEST_F(SpdyNetworkTransactionTest, FlowControlStallResumeAfterSettings) {
rv = callback.WaitForResult();
helper.VerifyDataConsumed();
- // If stream is NULL, that means it was unstalled and closed.
- EXPECT_TRUE(stream->stream() == NULL);
+ // If stream is nullptr, that means it was unstalled and closed.
+ EXPECT_TRUE(stream->stream() == nullptr);
}
// Test we correctly handle the case where the SETTINGS frame results in a
@@ -5864,7 +6016,7 @@ TEST_F(SpdyNetworkTransactionTest, FlowControlNegativeSendWindowSize) {
SpdySerializedFrame req(spdy_util_.ConstructSpdyPost(
kDefaultUrl, 1,
/*content_length=*/kBufferSize * num_upload_buffers + kUploadDataSize,
- LOWEST, NULL, 0));
+ LOWEST, nullptr, 0));
// Full frames.
SpdySerializedFrame body1(spdy_util_.ConstructSpdyDataFrame(
@@ -5940,7 +6092,7 @@ TEST_F(SpdyNetworkTransactionTest, FlowControlNegativeSendWindowSize) {
writes.push_back(CreateMockWrite(body4, i++));
writes.push_back(CreateMockWrite(body5, i++));
- SpdySerializedFrame reply(spdy_util_.ConstructSpdyPostReply(NULL, 0));
+ SpdySerializedFrame reply(spdy_util_.ConstructSpdyPostReply(nullptr, 0));
reads.push_back(CreateMockRead(reply, i++));
reads.push_back(CreateMockRead(body2, i++));
reads.push_back(CreateMockRead(body5, i++));
@@ -5963,7 +6115,7 @@ TEST_F(SpdyNetworkTransactionTest, FlowControlNegativeSendWindowSize) {
request.url = default_url_;
request.upload_data_stream = &upload_data_stream;
NormalSpdyTransactionHelper helper(request, DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunPreTestSetup();
helper.AddData(&data);
@@ -6018,7 +6170,7 @@ TEST_F(SpdyNetworkTransactionTest, GoAwayOnOddPushStreamId) {
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunToCompletion(&data);
TransactionHelperResult out = helper.output();
EXPECT_THAT(out.rv, IsError(ERR_SPDY_PROTOCOL_ERROR));
@@ -6027,28 +6179,31 @@ TEST_F(SpdyNetworkTransactionTest, GoAwayOnOddPushStreamId) {
TEST_F(SpdyNetworkTransactionTest,
GoAwayOnPushStreamIdLesserOrEqualThanLastAccepted) {
SpdySerializedFrame push_a(spdy_util_.ConstructSpdyPush(
- NULL, 0, 4, 1, GetDefaultUrlWithPath("/a.dat").c_str()));
+ nullptr, 0, 4, 1, GetDefaultUrlWithPath("/a.dat").c_str()));
SpdyHeaderBlock push_b_headers;
spdy_util_.AddUrlToHeaderBlock(GetDefaultUrlWithPath("/b.dat"),
&push_b_headers);
SpdySerializedFrame push_b(spdy_util_.ConstructInitialSpdyPushFrame(
std::move(push_b_headers), 2, 1));
MockRead reads[] = {
- CreateMockRead(push_a, 1), CreateMockRead(push_b, 2),
+ CreateMockRead(push_a, 1), CreateMockRead(push_b, 3),
};
SpdySerializedFrame req(
spdy_util_.ConstructSpdyGet(nullptr, 0, 1, LOWEST, true));
+ SpdySerializedFrame priority_a(
+ spdy_util_.ConstructSpdyPriority(4, 1, IDLE, true));
SpdySerializedFrame goaway(spdy_util_.ConstructSpdyGoAway(
4, GOAWAY_PROTOCOL_ERROR,
"New push stream id must be greater than the last accepted."));
MockWrite writes[] = {
- CreateMockWrite(req, 0), CreateMockWrite(goaway, 3),
+ CreateMockWrite(req, 0), CreateMockWrite(priority_a, 2),
+ CreateMockWrite(goaway, 4),
};
SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunToCompletion(&data);
TransactionHelperResult out = helper.output();
EXPECT_THAT(out.rv, IsError(ERR_SPDY_PROTOCOL_ERROR));
@@ -6287,12 +6442,12 @@ class SpdyNetworkTransactionTLSUsageCheckTest
spdy_util_.ConstructSpdyGoAway(0, GOAWAY_INADEQUATE_SECURITY, ""));
MockWrite writes[] = {CreateMockWrite(goaway)};
- StaticSocketDataProvider data(NULL, 0, writes, arraysize(writes));
+ StaticSocketDataProvider data(nullptr, 0, writes, arraysize(writes));
HttpRequestInfo request;
request.method = "GET";
request.url = default_url_;
NormalSpdyTransactionHelper helper(request, DEFAULT_PRIORITY,
- NetLogWithSource(), NULL);
+ NetLogWithSource(), nullptr);
helper.RunToCompletionWithSSLData(&data, std::move(ssl_provider));
TransactionHelperResult out = helper.output();
EXPECT_THAT(out.rv, IsError(ERR_SPDY_INADEQUATE_TRANSPORT_SECURITY));
« no previous file with comments | « net/spdy/spdy_http_stream.cc ('k') | net/spdy/spdy_session.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698