| Index: net/tools/quic/quic_simple_server_session.cc
|
| diff --git a/net/tools/quic/quic_simple_server_session.cc b/net/tools/quic/quic_simple_server_session.cc
|
| index 834e587c4c20a376797f665aeb49b135ae1ae684..8862ae736493cb3287597c617917b6951cdc92d5 100644
|
| --- a/net/tools/quic/quic_simple_server_session.cc
|
| +++ b/net/tools/quic/quic_simple_server_session.cc
|
| @@ -26,7 +26,7 @@ QuicSimpleServerSession::QuicSimpleServerSession(
|
| QuicCryptoServerStream::Helper* helper,
|
| const QuicCryptoServerConfig* crypto_config,
|
| QuicCompressedCertsCache* compressed_certs_cache,
|
| - QuicInMemoryCache* in_memory_cache)
|
| + QuicHttpResponseCache* response_cache)
|
| : QuicServerSessionBase(config,
|
| connection,
|
| visitor,
|
| @@ -34,7 +34,7 @@ QuicSimpleServerSession::QuicSimpleServerSession(
|
| crypto_config,
|
| compressed_certs_cache),
|
| highest_promised_stream_id_(0),
|
| - in_memory_cache_(in_memory_cache) {}
|
| + response_cache_(response_cache) {}
|
|
|
| QuicSimpleServerSession::~QuicSimpleServerSession() {
|
| delete connection();
|
| @@ -69,14 +69,14 @@ void QuicSimpleServerSession::OnStreamFrame(const QuicStreamFrame& frame) {
|
|
|
| void QuicSimpleServerSession::PromisePushResources(
|
| const string& request_url,
|
| - const std::list<QuicInMemoryCache::ServerPushInfo>& resources,
|
| + const std::list<QuicHttpResponseCache::ServerPushInfo>& resources,
|
| QuicStreamId original_stream_id,
|
| const SpdyHeaderBlock& original_request_headers) {
|
| if (!server_push_enabled()) {
|
| return;
|
| }
|
|
|
| - for (QuicInMemoryCache::ServerPushInfo resource : resources) {
|
| + for (QuicHttpResponseCache::ServerPushInfo resource : resources) {
|
| SpdyHeaderBlock headers = SynthesizePushRequestHeaders(
|
| request_url, resource, original_request_headers);
|
| highest_promised_stream_id_ += 2;
|
| @@ -97,7 +97,7 @@ QuicSpdyStream* QuicSimpleServerSession::CreateIncomingDynamicStream(
|
| }
|
|
|
| QuicSpdyStream* stream =
|
| - new QuicSimpleServerStream(id, this, in_memory_cache_);
|
| + new QuicSimpleServerStream(id, this, response_cache_);
|
| ActivateStream(base::WrapUnique(stream));
|
| return stream;
|
| }
|
| @@ -109,7 +109,7 @@ QuicSimpleServerStream* QuicSimpleServerSession::CreateOutgoingDynamicStream(
|
| }
|
|
|
| QuicSimpleServerStream* stream = new QuicSimpleServerStream(
|
| - GetNextOutgoingStreamId(), this, in_memory_cache_);
|
| + GetNextOutgoingStreamId(), this, response_cache_);
|
| stream->SetPriority(priority);
|
| ActivateStream(base::WrapUnique(stream));
|
| return stream;
|
| @@ -151,7 +151,7 @@ void QuicSimpleServerSession::HandleRstOnValidNonexistentStream(
|
|
|
| SpdyHeaderBlock QuicSimpleServerSession::SynthesizePushRequestHeaders(
|
| string request_url,
|
| - QuicInMemoryCache::ServerPushInfo resource,
|
| + QuicHttpResponseCache::ServerPushInfo resource,
|
| const SpdyHeaderBlock& original_request_headers) {
|
| GURL push_request_url = resource.request_url;
|
| string path = push_request_url.path();
|
|
|