Commit 68a80ebd authored by rch's avatar rch Committed by Commit bot

Remove test-only method QuicStreamFactory::CreateFromSession()

Review-Url: https://codereview.chromium.org/2840633002
Cr-Commit-Position: refs/heads/master@{#466885}
parent 63beb148
......@@ -1059,12 +1059,6 @@ void QuicStreamFactory::OnCertVerifyJobComplete(CertVerifierJob* job, int rv) {
active_cert_verifier_jobs_.erase(job->server_id());
}
std::unique_ptr<QuicHttpStream> QuicStreamFactory::CreateFromSession(
QuicChromiumClientSession* session) {
return base::MakeUnique<QuicHttpStream>(session->GetWeakPtr(),
http_server_properties_);
}
void QuicStreamFactory::OnIdleSession(QuicChromiumClientSession* session) {}
void QuicStreamFactory::OnSessionGoingAway(QuicChromiumClientSession* session) {
......
......@@ -399,10 +399,6 @@ class NET_EXPORT_PRIVATE QuicStreamFactory
typedef std::map<QuicServerId, std::unique_ptr<CertVerifierJob>>
CertVerifierJobMap;
// Returns a newly created QuicHttpStream owned by the caller.
std::unique_ptr<QuicHttpStream> CreateFromSession(
QuicChromiumClientSession* session);
bool OnResolution(const QuicSessionKey& key, const AddressList& address_list);
void OnJobComplete(Job* job, int rv);
void OnCertVerifyJobComplete(CertVerifierJob* job, int rv);
......
......@@ -53,12 +53,6 @@ QuicChromiumClientSession* QuicStreamFactoryPeer::GetActiveSession(
return factory->active_sessions_[server_id];
}
std::unique_ptr<QuicHttpStream> QuicStreamFactoryPeer::CreateFromSession(
QuicStreamFactory* factory,
QuicChromiumClientSession* session) {
return factory->CreateFromSession(session);
}
bool QuicStreamFactoryPeer::IsLiveSession(QuicStreamFactory* factory,
QuicChromiumClientSession* session) {
for (QuicStreamFactory::SessionIdMap::iterator it =
......
......@@ -24,7 +24,6 @@ class QuicChromiumClientSession;
class QuicClientPushPromiseIndex;
class QuicConfig;
class QuicCryptoClientConfig;
class QuicHttpStream;
class QuicStreamFactory;
namespace test {
......@@ -48,10 +47,6 @@ class QuicStreamFactoryPeer {
QuicStreamFactory* factory,
const QuicServerId& server_id);
static std::unique_ptr<QuicHttpStream> CreateFromSession(
QuicStreamFactory* factory,
QuicChromiumClientSession* session);
static bool IsLiveSession(QuicStreamFactory* factory,
QuicChromiumClientSession* session);
......
......@@ -262,12 +262,6 @@ class QuicStreamFactoryTestBase {
return QuicStreamFactoryPeer::GetActiveSession(factory_.get(), server_id);
}
std::unique_ptr<QuicHttpStream> CreateFromSession(
const HostPortPair& host_port_pair) {
QuicChromiumClientSession* session = GetActiveSession(host_port_pair);
return QuicStreamFactoryPeer::CreateFromSession(factory_.get(), session);
}
int GetSourcePortForNewSession(const HostPortPair& destination) {
return GetSourcePortForNewSessionInner(destination, false);
}
......@@ -780,17 +774,22 @@ TEST_P(QuicStreamFactoryTest, Create) {
std::unique_ptr<QuicHttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
QuicStreamRequest request2(factory_.get(), &http_server_properties_);
EXPECT_EQ(OK, request2.Request(host_port_pair_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
// Will reset stream 3.
stream = CreateFromSession(host_port_pair_);
stream = request.CreateStream();
EXPECT_TRUE(stream.get());
// TODO(rtenneti): We should probably have a tests that HTTP and HTTPS result
// in streams on different sessions.
QuicStreamRequest request2(factory_.get(), &http_server_properties_);
EXPECT_EQ(OK, request2.Request(host_port_pair_, privacy_mode_,
QuicStreamRequest request3(factory_.get(), &http_server_properties_);
EXPECT_EQ(OK, request3.Request(host_port_pair_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
stream = request2.CreateStream(); // Will reset stream 5.
stream = request3.CreateStream(); // Will reset stream 5.
stream.reset(); // Will reset stream 7.
EXPECT_TRUE(socket_data.AllReadDataConsumed());
......@@ -1532,7 +1531,12 @@ TEST_P(QuicStreamFactoryTest, CancelCreate) {
base::RunLoop().RunUntilIdle();
std::unique_ptr<QuicHttpStream> stream(CreateFromSession(host_port_pair_));
QuicStreamRequest request2(factory_.get(), &http_server_properties_);
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();
EXPECT_TRUE(stream.get());
stream.reset();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment