net/quic/chromium/quic_stream_factory_test.cc - Issue 2814633003: Extract Proxy Resolution out of HttpStreamFactoryImpl::Job

Unified Diff: net/quic/chromium/quic_stream_factory_test.cc

Issue 2814633003: Extract Proxy Resolution out of HttpStreamFactoryImpl::Job (Closed)

Patch Set: fix remaining tests Created 3 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: net/quic/chromium/quic_stream_factory_test.cc

diff --git a/net/quic/chromium/quic_stream_factory_test.cc b/net/quic/chromium/quic_stream_factory_test.cc

index d6d0b9d22351be4872088188fdb599e80cb4c6e8..6343af9cd762df5546e5d17ca92eeccc142a7850 100644

--- a/net/quic/chromium/quic_stream_factory_test.cc

+++ b/net/quic/chromium/quic_stream_factory_test.cc

@@ -157,8 +157,8 @@ std::vector<PoolingTestParams> GetPoolingTestParams() {

class QuicHttpStreamPeer {

public:

- static QuicChromiumClientSession* GetSession(QuicHttpStream* stream) {

- return stream->session_.get();

+ static QuicChromiumClientSession* GetSession(HttpStream* stream) {

+ return static_cast<QuicHttpStream*>(stream)->session_.get();

}

};

@@ -291,7 +291,7 @@ class QuicStreamFactoryTestBase {

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

stream.reset();

@@ -440,7 +440,7 @@ class QuicStreamFactoryTestBase {

// posted by QuicChromiumClientSession::MigrateToSocket().

base::RunLoop().RunUntilIdle();

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

// Cause QUIC stream to be created.

@@ -771,7 +771,7 @@ TEST_P(QuicStreamFactoryTest, Create) {

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

QuicStreamRequest request2(factory_.get(), &http_server_properties_);

@@ -816,7 +816,7 @@ TEST_P(QuicStreamFactoryTest, CreateZeroRtt) {

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

EXPECT_TRUE(socket_data.AllReadDataConsumed());

EXPECT_TRUE(socket_data.AllWriteDataConsumed());

@@ -842,7 +842,7 @@ TEST_P(QuicStreamFactoryTest, CreateZeroRttPost) {

/*cert_verify_flags=*/0, url_, "POST", net_log_,

callback_.callback()));

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

EXPECT_TRUE(socket_data.AllReadDataConsumed());

EXPECT_TRUE(socket_data.AllWriteDataConsumed());

@@ -867,7 +867,7 @@ TEST_P(QuicStreamFactoryTest, DefaultInitialRtt) {

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

QuicChromiumClientSession* session = GetActiveSession(host_port_pair_);

@@ -900,7 +900,7 @@ TEST_P(QuicStreamFactoryTest, CachedInitialRtt) {

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

QuicChromiumClientSession* session = GetActiveSession(host_port_pair_);

@@ -933,7 +933,7 @@ TEST_P(QuicStreamFactoryTest, 2gInitialRtt) {

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

QuicChromiumClientSession* session = GetActiveSession(host_port_pair_);

@@ -966,7 +966,7 @@ TEST_P(QuicStreamFactoryTest, 3gInitialRtt) {

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

QuicChromiumClientSession* session = GetActiveSession(host_port_pair_);

@@ -994,7 +994,7 @@ TEST_P(QuicStreamFactoryTest, GoAway) {

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

QuicChromiumClientSession* session = GetActiveSession(host_port_pair_);

@@ -1026,7 +1026,7 @@ TEST_P(QuicStreamFactoryTest, GoAwayForConnectionMigrationWithPortOnly) {

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

QuicChromiumClientSession* session = GetActiveSession(host_port_pair_);

@@ -1070,7 +1070,7 @@ TEST_P(QuicStreamFactoryTest, Pooling) {

EXPECT_EQ(OK, request.Request(host_port_pair_, privacy_mode_,

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

TestCompletionCallback callback;

@@ -1078,7 +1078,7 @@ TEST_P(QuicStreamFactoryTest, Pooling) {

EXPECT_EQ(OK, request2.Request(server2, privacy_mode_,

/*cert_verify_flags=*/0, url2_, "GET",

net_log_, callback.callback()));

- std::unique_ptr<QuicHttpStream> stream2 = request2.CreateStream();

+ std::unique_ptr<HttpStream> stream2 = request2.CreateStream();

EXPECT_TRUE(stream2.get());

EXPECT_EQ(GetActiveSession(host_port_pair_), GetActiveSession(server2));

@@ -1131,7 +1131,7 @@ TEST_P(QuicStreamFactoryTest, PoolingWithServerMigration) {

/*cert_verify_flags=*/0, url2_, "GET", net_log_,

callback.callback()));

EXPECT_EQ(OK, callback.WaitForResult());

- std::unique_ptr<QuicHttpStream> stream2 = request2.CreateStream();

+ std::unique_ptr<HttpStream> stream2 = request2.CreateStream();

EXPECT_TRUE(stream2.get());

EXPECT_TRUE(socket_data.AllReadDataConsumed());

@@ -1168,7 +1168,7 @@ TEST_P(QuicStreamFactoryTest, NoPoolingAfterGoAway) {

EXPECT_EQ(OK, request.Request(host_port_pair_, privacy_mode_,

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

TestCompletionCallback callback;

@@ -1176,7 +1176,7 @@ TEST_P(QuicStreamFactoryTest, NoPoolingAfterGoAway) {

EXPECT_EQ(OK, request2.Request(server2, privacy_mode_,

/*cert_verify_flags=*/0, url2_, "GET",

net_log_, callback.callback()));

- std::unique_ptr<QuicHttpStream> stream2 = request2.CreateStream();

+ std::unique_ptr<HttpStream> stream2 = request2.CreateStream();

EXPECT_TRUE(stream2.get());

factory_->OnSessionGoingAway(GetActiveSession(host_port_pair_));

@@ -1188,7 +1188,7 @@ TEST_P(QuicStreamFactoryTest, NoPoolingAfterGoAway) {

EXPECT_EQ(OK, request3.Request(server2, privacy_mode_,

/*cert_verify_flags=*/0, url2_, "GET",

net_log_, callback3.callback()));

- std::unique_ptr<QuicHttpStream> stream3 = request3.CreateStream();

+ std::unique_ptr<HttpStream> stream3 = request3.CreateStream();

EXPECT_TRUE(stream3.get());

EXPECT_TRUE(HasActiveSession(server2));

@@ -1223,7 +1223,7 @@ TEST_P(QuicStreamFactoryTest, HttpsPooling) {

EXPECT_EQ(OK, request.Request(server1, privacy_mode_,

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

TestCompletionCallback callback;

@@ -1231,7 +1231,7 @@ TEST_P(QuicStreamFactoryTest, HttpsPooling) {

EXPECT_EQ(OK, request2.Request(server2, privacy_mode_,

/*cert_verify_flags=*/0, url2_, "GET",

net_log_, callback_.callback()));

- std::unique_ptr<QuicHttpStream> stream2 = request2.CreateStream();

+ std::unique_ptr<HttpStream> stream2 = request2.CreateStream();

EXPECT_TRUE(stream2.get());

EXPECT_EQ(GetActiveSession(server1), GetActiveSession(server2));

@@ -1269,7 +1269,7 @@ TEST_P(QuicStreamFactoryTest, HttpsPoolingWithMatchingPins) {

EXPECT_EQ(OK, request.Request(server1, privacy_mode_,

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

TestCompletionCallback callback;

@@ -1277,7 +1277,7 @@ TEST_P(QuicStreamFactoryTest, HttpsPoolingWithMatchingPins) {

EXPECT_EQ(OK, request2.Request(server2, privacy_mode_,

/*cert_verify_flags=*/0, url2_, "GET",

net_log_, callback_.callback()));

- std::unique_ptr<QuicHttpStream> stream2 = request2.CreateStream();

+ std::unique_ptr<HttpStream> stream2 = request2.CreateStream();

EXPECT_TRUE(stream2.get());

EXPECT_EQ(GetActiveSession(server1), GetActiveSession(server2));

@@ -1328,7 +1328,7 @@ TEST_P(QuicStreamFactoryTest, NoHttpsPoolingWithDifferentPins) {

EXPECT_EQ(OK, request.Request(server1, privacy_mode_,

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

TestCompletionCallback callback;

@@ -1336,7 +1336,7 @@ TEST_P(QuicStreamFactoryTest, NoHttpsPoolingWithDifferentPins) {

EXPECT_EQ(OK, request2.Request(server2, privacy_mode_,

/*cert_verify_flags=*/0, url2_, "GET",

net_log_, callback_.callback()));

- std::unique_ptr<QuicHttpStream> stream2 = request2.CreateStream();

+ std::unique_ptr<HttpStream> stream2 = request2.CreateStream();

EXPECT_TRUE(stream2.get());

EXPECT_NE(GetActiveSession(server1), GetActiveSession(server2));

@@ -1373,7 +1373,7 @@ TEST_P(QuicStreamFactoryTest, Goaway) {

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

// Mark the session as going away. Ensure that while it is still alive

@@ -1392,7 +1392,7 @@ TEST_P(QuicStreamFactoryTest, Goaway) {

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream2 = request2.CreateStream();

+ std::unique_ptr<HttpStream> stream2 = request2.CreateStream();

EXPECT_TRUE(stream2.get());

EXPECT_TRUE(HasActiveSession(host_port_pair_));

@@ -1427,7 +1427,7 @@ TEST_P(QuicStreamFactoryTest, MaxOpenStream) {

socket_data.AddSocketDataToFactory(&socket_factory_);

HttpRequestInfo request_info;

- std::vector<std::unique_ptr<QuicHttpStream>> streams;

+ std::vector<std::unique_ptr<HttpStream>> streams;

// The MockCryptoClientStream sets max_open_streams to be

// kDefaultMaxStreamsPerConnection / 2.

for (size_t i = 0; i < kDefaultMaxStreamsPerConnection / 2; i++) {

@@ -1441,7 +1441,7 @@ TEST_P(QuicStreamFactoryTest, MaxOpenStream) {

} else {

EXPECT_THAT(rv, IsOk());

}

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream);

EXPECT_EQ(OK, stream->InitializeStream(&request_info, DEFAULT_PRIORITY,

net_log_, CompletionCallback()));

@@ -1452,7 +1452,7 @@ TEST_P(QuicStreamFactoryTest, MaxOpenStream) {

EXPECT_EQ(OK, request.Request(host_port_pair_, privacy_mode_,

/*cert_verify_flags=*/0, url_, "GET", net_log_,

CompletionCallback()));

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream);

EXPECT_EQ(ERR_IO_PENDING,

stream->InitializeStream(&request_info, DEFAULT_PRIORITY, net_log_,

@@ -1535,7 +1535,7 @@ TEST_P(QuicStreamFactoryTest, CancelCreate) {

EXPECT_EQ(OK, request2.Request(host_port_pair_, privacy_mode_,

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

- std::unique_ptr<QuicHttpStream> stream = request2.CreateStream();

+ std::unique_ptr<HttpStream> stream = request2.CreateStream();

EXPECT_TRUE(stream.get());

stream.reset();

@@ -1572,7 +1572,7 @@ TEST_P(QuicStreamFactoryTest, CloseAllSessions) {

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

HttpRequestInfo request_info;

EXPECT_EQ(OK, stream->InitializeStream(&request_info, DEFAULT_PRIORITY,

net_log_, CompletionCallback()));

@@ -1658,7 +1658,7 @@ TEST_P(QuicStreamFactoryTest,

EXPECT_FALSE(HasActiveJob(host_port_pair_, privacy_mode_));

// Create QuicHttpStream.

- std::unique_ptr<QuicHttpStream> stream = request2.CreateStream();

+ std::unique_ptr<HttpStream> stream = request2.CreateStream();

EXPECT_TRUE(stream.get());

stream.reset();

EXPECT_TRUE(socket_data.AllReadDataConsumed());

@@ -1720,7 +1720,7 @@ TEST_P(QuicStreamFactoryTest, WriteErrorInCryptoConnectWithSyncHostResolution) {

EXPECT_FALSE(HasActiveJob(host_port_pair_, privacy_mode_));

// Create QuicHttpStream.

- std::unique_ptr<QuicHttpStream> stream = request2.CreateStream();

+ std::unique_ptr<HttpStream> stream = request2.CreateStream();

EXPECT_TRUE(stream.get());

stream.reset();

EXPECT_TRUE(socket_data.AllReadDataConsumed());

@@ -1758,7 +1758,7 @@ TEST_P(QuicStreamFactoryTest, OnIPAddressChanged) {

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

HttpRequestInfo request_info;

EXPECT_EQ(OK, stream->InitializeStream(&request_info, DEFAULT_PRIORITY,

net_log_, CompletionCallback()));

@@ -1826,7 +1826,7 @@ void QuicStreamFactoryTestBase::OnNetworkMadeDefault(bool async_write_before) {

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

// Cause QUIC stream to be created.

@@ -1895,7 +1895,7 @@ void QuicStreamFactoryTestBase::OnNetworkMadeDefault(bool async_write_before) {

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream2 = request2.CreateStream();

+ std::unique_ptr<HttpStream> stream2 = request2.CreateStream();

EXPECT_TRUE(stream2.get());

EXPECT_TRUE(HasActiveSession(host_port_pair_));

@@ -1959,7 +1959,7 @@ void QuicStreamFactoryTestBase::OnNetworkDisconnected(bool async_write_before) {

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

// Cause QUIC stream to be created.

@@ -2023,7 +2023,7 @@ void QuicStreamFactoryTestBase::OnNetworkDisconnected(bool async_write_before) {

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream2 = request2.CreateStream();

+ std::unique_ptr<HttpStream> stream2 = request2.CreateStream();

EXPECT_TRUE(stream2.get());

EXPECT_TRUE(HasActiveSession(host_port_pair_));

@@ -2073,7 +2073,7 @@ void QuicStreamFactoryTestBase::OnNetworkDisconnectedWithNetworkList(

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

// Cause QUIC stream to be created.

@@ -2133,7 +2133,7 @@ TEST_P(QuicStreamFactoryTest, OnNetworkMadeDefaultNonMigratableStream) {

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

// Cause QUIC stream to be created, but marked as non-migratable.

@@ -2184,7 +2184,7 @@ TEST_P(QuicStreamFactoryTest, OnNetworkMadeDefaultConnectionMigrationDisabled) {

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

// Cause QUIC stream to be created.

@@ -2238,7 +2238,7 @@ TEST_P(QuicStreamFactoryTest, OnNetworkDisconnectedNonMigratableStream) {

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

// Cause QUIC stream to be created, but marked as non-migratable.

@@ -2288,7 +2288,7 @@ TEST_P(QuicStreamFactoryTest,

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

// Cause QUIC stream to be created.

@@ -2338,7 +2338,7 @@ TEST_P(QuicStreamFactoryTest, OnNetworkMadeDefaultNoOpenStreams) {

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

// Ensure that session is alive and active.

@@ -2378,7 +2378,7 @@ TEST_P(QuicStreamFactoryTest, OnNetworkDisconnectedNoOpenStreams) {

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

// Ensure that session is alive and active.

@@ -2421,7 +2421,7 @@ TEST_P(QuicStreamFactoryTest, OnNetworkChangeDisconnectedPauseBeforeConnected) {

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

// Cause QUIC stream to be created.

@@ -2498,7 +2498,7 @@ TEST_P(QuicStreamFactoryTest, OnNetworkChangeDisconnectedPauseBeforeConnected) {

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream2 = request2.CreateStream();

+ std::unique_ptr<HttpStream> stream2 = request2.CreateStream();

EXPECT_TRUE(stream2.get());

EXPECT_TRUE(HasActiveSession(host_port_pair_));

@@ -2549,7 +2549,7 @@ TEST_P(QuicStreamFactoryTest,

EXPECT_EQ(OK, request1.Request(server1, privacy_mode_,

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

- std::unique_ptr<QuicHttpStream> stream1 = request1.CreateStream();

+ std::unique_ptr<HttpStream> stream1 = request1.CreateStream();

EXPECT_TRUE(stream1.get());

// Create request and QuicHttpStream to create session2.

@@ -2557,7 +2557,7 @@ TEST_P(QuicStreamFactoryTest,

EXPECT_EQ(OK, request2.Request(server2, privacy_mode_,

/*cert_verify_flags=*/0, url2_, "GET",

net_log_, callback_.callback()));

- std::unique_ptr<QuicHttpStream> stream2 = request2.CreateStream();

+ std::unique_ptr<HttpStream> stream2 = request2.CreateStream();

EXPECT_TRUE(stream2.get());

QuicChromiumClientSession* session1 = GetActiveSession(server1);

@@ -2644,7 +2644,7 @@ TEST_P(QuicStreamFactoryTest, MigrateSessionEarly) {

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

// Cause QUIC stream to be created.

@@ -2709,7 +2709,7 @@ TEST_P(QuicStreamFactoryTest, MigrateSessionEarly) {

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream2 = request2.CreateStream();

+ std::unique_ptr<HttpStream> stream2 = request2.CreateStream();

EXPECT_TRUE(stream2.get());

EXPECT_TRUE(HasActiveSession(host_port_pair_));

@@ -2771,7 +2771,7 @@ TEST_P(QuicStreamFactoryTest, MigrateSessionEarlyWithAsyncWrites) {

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

// Cause QUIC stream to be created.

@@ -2838,7 +2838,7 @@ TEST_P(QuicStreamFactoryTest, MigrateSessionEarlyWithAsyncWrites) {

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream2 = request2.CreateStream();

+ std::unique_ptr<HttpStream> stream2 = request2.CreateStream();

EXPECT_TRUE(stream2.get());

EXPECT_TRUE(HasActiveSession(host_port_pair_));

@@ -2893,7 +2893,7 @@ TEST_P(QuicStreamFactoryTest, MigrateSessionEarlyNoNewNetwork) {

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

// Cause QUIC stream to be created.

@@ -2947,7 +2947,7 @@ TEST_P(QuicStreamFactoryTest, MigrateSessionEarlyNonMigratableStream) {

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

// Cause QUIC stream to be created, but marked as non-migratable.

@@ -3001,7 +3001,7 @@ TEST_P(QuicStreamFactoryTest, MigrateSessionEarlyConnectionMigrationDisabled) {

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

// Cause QUIC stream to be created.

@@ -3060,7 +3060,7 @@ void QuicStreamFactoryTestBase::TestMigrationOnWriteError(

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_EQ(OK, callback_.WaitForResult());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

// Cause QUIC stream to be created.

@@ -3150,7 +3150,7 @@ void QuicStreamFactoryTestBase::TestMigrationOnWriteErrorNoNewNetwork(

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_EQ(OK, callback_.WaitForResult());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

// Cause QUIC stream to be created.

@@ -3241,7 +3241,7 @@ void QuicStreamFactoryTestBase::TestMigrationOnWriteErrorNonMigratableStream(

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_EQ(OK, callback_.WaitForResult());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

// Cause QUIC stream to be created, but marked as non-migratable.

@@ -3307,7 +3307,7 @@ void QuicStreamFactoryTestBase::TestMigrationOnWriteErrorMigrationDisabled(

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_EQ(OK, callback_.WaitForResult());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

// Cause QUIC stream to be created.

@@ -3388,7 +3388,7 @@ void QuicStreamFactoryTestBase::TestMigrationOnMultipleWriteErrors(

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_EQ(OK, callback_.WaitForResult());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

// Cause QUIC stream to be created.

@@ -3469,7 +3469,7 @@ void QuicStreamFactoryTestBase::TestMigrationOnWriteErrorWithNotificationQueued(

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_EQ(OK, callback_.WaitForResult());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

// Cause QUIC stream to be created.

@@ -3567,7 +3567,7 @@ void QuicStreamFactoryTestBase::TestMigrationOnNotificationWithWriteErrorQueued(

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_EQ(OK, callback_.WaitForResult());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

// Cause QUIC stream to be created.

@@ -3666,7 +3666,7 @@ void QuicStreamFactoryTestBase::TestMigrationOnWriteErrorPauseBeforeConnected(

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_EQ(OK, callback_.WaitForResult());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

// Cause QUIC stream to be created.

@@ -3748,7 +3748,7 @@ void QuicStreamFactoryTestBase::TestMigrationOnWriteErrorPauseBeforeConnected(

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream2 = request2.CreateStream();

+ std::unique_ptr<HttpStream> stream2 = request2.CreateStream();

EXPECT_TRUE(stream2.get());

EXPECT_TRUE(HasActiveSession(host_port_pair_));

@@ -3801,7 +3801,7 @@ void QuicStreamFactoryTestBase::

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_EQ(OK, callback_.WaitForResult());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

// Cause QUIC stream to be created.

@@ -3891,7 +3891,7 @@ void QuicStreamFactoryTestBase::

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream2 = request2.CreateStream();

+ std::unique_ptr<HttpStream> stream2 = request2.CreateStream();

EXPECT_TRUE(stream2.get());

EXPECT_TRUE(HasActiveSession(host_port_pair_));

@@ -3957,7 +3957,7 @@ TEST_P(QuicStreamFactoryTest, MigrateSessionEarlyToBadSocket) {

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

// Cause QUIC stream to be created.

@@ -4021,7 +4021,7 @@ TEST_P(QuicStreamFactoryTest, ServerMigration) {

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_EQ(OK, callback_.WaitForResult());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

// Cause QUIC stream to be created.

@@ -4164,7 +4164,7 @@ TEST_P(QuicStreamFactoryTest, ServerMigrationIPv4ToIPv6Fails) {

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_EQ(OK, callback_.WaitForResult());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

// Cause QUIC stream to be created.

@@ -4223,7 +4223,7 @@ TEST_P(QuicStreamFactoryTest, OnSSLConfigChanged) {

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

HttpRequestInfo request_info;

EXPECT_EQ(OK, stream->InitializeStream(&request_info, DEFAULT_PRIORITY,

net_log_, CompletionCallback()));

@@ -4280,7 +4280,7 @@ TEST_P(QuicStreamFactoryTest, OnCertDBChanged) {

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

HttpRequestInfo request_info;

EXPECT_EQ(OK, stream->InitializeStream(&request_info, DEFAULT_PRIORITY,

net_log_, CompletionCallback()));

@@ -4408,7 +4408,7 @@ TEST_P(QuicStreamFactoryTest, EnableNotLoadFromDiskCache) {

// the CancelWaitForDataReady task hasn't been posted.

ASSERT_EQ(0u, runner_->GetPostedTasks().size());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

EXPECT_TRUE(socket_data.AllReadDataConsumed());

EXPECT_TRUE(socket_data.AllWriteDataConsumed());

@@ -4459,7 +4459,7 @@ TEST_P(QuicStreamFactoryTest, ReducePingTimeoutOnConnectionTimeOutOpenStreams) {

EXPECT_EQ(QuicTime::Delta::FromSeconds(kPingTimeoutSecs),

session->connection()->ping_timeout());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

HttpRequestInfo request_info;

EXPECT_EQ(OK, stream->InitializeStream(&request_info, DEFAULT_PRIORITY,

@@ -4490,7 +4490,7 @@ TEST_P(QuicStreamFactoryTest, ReducePingTimeoutOnConnectionTimeOutOpenStreams) {

EXPECT_EQ(QuicTime::Delta::FromSeconds(10),

session2->connection()->ping_timeout());

- std::unique_ptr<QuicHttpStream> stream2 = request2.CreateStream();

+ std::unique_ptr<HttpStream> stream2 = request2.CreateStream();

EXPECT_TRUE(stream2.get());

EXPECT_EQ(OK, stream2->InitializeStream(&request_info, DEFAULT_PRIORITY,

net_log_, CompletionCallback()));

@@ -4564,7 +4564,7 @@ TEST_P(QuicStreamFactoryTest, StartCertVerifyJob) {

EXPECT_EQ(OK, callback_.WaitForResult());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

// Restore |race_cert_verification|.

@@ -4617,7 +4617,7 @@ TEST_P(QuicStreamFactoryTest, YieldAfterPackets) {

// yielded the read.

EXPECT_EQ(1u, observer.executed_count());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_FALSE(stream.get()); // Session is already closed.

EXPECT_TRUE(socket_data.AllReadDataConsumed());

EXPECT_TRUE(socket_data.AllWriteDataConsumed());

@@ -4662,7 +4662,7 @@ TEST_P(QuicStreamFactoryTest, YieldAfterDuration) {

// yielded the read.

EXPECT_EQ(1u, observer.executed_count());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_FALSE(stream.get()); // Session is already closed.

EXPECT_TRUE(socket_data.AllReadDataConsumed());

EXPECT_TRUE(socket_data.AllWriteDataConsumed());

@@ -4687,7 +4687,7 @@ TEST_P(QuicStreamFactoryTest, ServerPushSessionAffinity) {

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

EXPECT_EQ(0, QuicStreamFactoryPeer::GetNumPushStreamsCreated(factory_.get()));

@@ -4737,7 +4737,7 @@ TEST_P(QuicStreamFactoryTest, ServerPushPrivacyModeMismatch) {

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream = request.CreateStream();

+ std::unique_ptr<HttpStream> stream = request.CreateStream();

EXPECT_TRUE(stream.get());

EXPECT_EQ(0, QuicStreamFactoryPeer::GetNumPushStreamsCreated(factory_.get()));

@@ -4765,7 +4765,7 @@ TEST_P(QuicStreamFactoryTest, ServerPushPrivacyModeMismatch) {

EXPECT_EQ(index->GetPromised(kDefaultUrl), nullptr);

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream2 = request2.CreateStream();

+ std::unique_ptr<HttpStream> stream2 = request2.CreateStream();

EXPECT_TRUE(stream2.get());

EXPECT_TRUE(socket_data1.AllReadDataConsumed());

@@ -4798,7 +4798,7 @@ TEST_P(QuicStreamFactoryTest, PoolByOrigin) {

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream1 = request1.CreateStream();

+ std::unique_ptr<HttpStream> stream1 = request1.CreateStream();

EXPECT_TRUE(stream1.get());

EXPECT_TRUE(HasActiveSession(host_port_pair_));

@@ -4808,7 +4808,7 @@ TEST_P(QuicStreamFactoryTest, PoolByOrigin) {

EXPECT_EQ(OK, request2.Request(destination2, privacy_mode_,

/*cert_verify_flags=*/0, url_, "GET", net_log_,

callback2.callback()));

- std::unique_ptr<QuicHttpStream> stream2 = request2.CreateStream();

+ std::unique_ptr<HttpStream> stream2 = request2.CreateStream();

EXPECT_TRUE(stream2.get());

QuicChromiumClientSession* session1 =

@@ -4985,7 +4985,7 @@ TEST_P(QuicStreamFactoryWithDestinationTest, SharedCertificate) {

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream1 = request1.CreateStream();

+ std::unique_ptr<HttpStream> stream1 = request1.CreateStream();

EXPECT_TRUE(stream1.get());

EXPECT_TRUE(HasActiveSession(origin1_));

@@ -4995,7 +4995,7 @@ TEST_P(QuicStreamFactoryWithDestinationTest, SharedCertificate) {

EXPECT_EQ(OK, request2.Request(destination, privacy_mode_,

/*cert_verify_flags=*/0, url2, "GET", net_log_,

callback2.callback()));

- std::unique_ptr<QuicHttpStream> stream2 = request2.CreateStream();

+ std::unique_ptr<HttpStream> stream2 = request2.CreateStream();

EXPECT_TRUE(stream2.get());

QuicChromiumClientSession* session1 =

@@ -5058,7 +5058,7 @@ TEST_P(QuicStreamFactoryWithDestinationTest, DifferentPrivacyMode) {

/*cert_verify_flags=*/0, url1, "GET", net_log_,

callback_.callback()));

EXPECT_EQ(OK, callback_.WaitForResult());

- std::unique_ptr<QuicHttpStream> stream1 = request1.CreateStream();

+ std::unique_ptr<HttpStream> stream1 = request1.CreateStream();

EXPECT_TRUE(stream1.get());

EXPECT_TRUE(HasActiveSession(origin1_));

@@ -5069,7 +5069,7 @@ TEST_P(QuicStreamFactoryWithDestinationTest, DifferentPrivacyMode) {

/*cert_verify_flags=*/0, url2, "GET", net_log_,

callback2.callback()));

EXPECT_EQ(OK, callback2.WaitForResult());

- std::unique_ptr<QuicHttpStream> stream2 = request2.CreateStream();

+ std::unique_ptr<HttpStream> stream2 = request2.CreateStream();

EXPECT_TRUE(stream2.get());

// |request2| does not pool to the first session, because PrivacyMode does not

@@ -5143,7 +5143,7 @@ TEST_P(QuicStreamFactoryWithDestinationTest, DisjointCertificate) {

/*cert_verify_flags=*/0, url1, "GET", net_log_,

callback_.callback()));

EXPECT_THAT(callback_.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream1 = request1.CreateStream();

+ std::unique_ptr<HttpStream> stream1 = request1.CreateStream();

EXPECT_TRUE(stream1.get());

EXPECT_TRUE(HasActiveSession(origin1_));

@@ -5154,7 +5154,7 @@ TEST_P(QuicStreamFactoryWithDestinationTest, DisjointCertificate) {

/*cert_verify_flags=*/0, url2, "GET", net_log_,

callback2.callback()));

EXPECT_THAT(callback2.WaitForResult(), IsOk());

- std::unique_ptr<QuicHttpStream> stream2 = request2.CreateStream();

+ std::unique_ptr<HttpStream> stream2 = request2.CreateStream();

EXPECT_TRUE(stream2.get());

// |request2| does not pool to the first session, because the certificate does

« net/http/http_stream_factory_impl_job_controller_unittest.cc ('K') | « net/quic/chromium/quic_stream_factory_peer.cc ('k') | no next file » | no next file with comments »