diff options
| author | rtenneti <rtenneti@chromium.org> | 2015-10-12 14:25:01 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-12 21:25:46 +0000 |
| commit | 13c9d38d780f0127e2f1afe89843c6da701f7480 (patch) | |
| tree | 1bb3846ceacc8380d7a0a3f6b1d6b9e9b128431c /net/http | |
| parent | a58d25e1e87319be714f08a1c6cde9236301e356 (diff) | |
| download | chromium_src-13c9d38d780f0127e2f1afe89843c6da701f7480.zip chromium_src-13c9d38d780f0127e2f1afe89843c6da701f7480.tar.gz chromium_src-13c9d38d780f0127e2f1afe89843c6da701f7480.tar.bz2 | |
QUIC - Changes to transfer QuicServerInfoFactory ownership from HttpCache
to QuicStreamFactory.
R=rch@chromium.org
Review URL: https://codereview.chromium.org/1396683006
Cr-Commit-Position: refs/heads/master@{#353596}
Diffstat (limited to 'net/http')
| -rw-r--r-- | net/http/http_cache.cc | 5 | ||||
| -rw-r--r-- | net/http/http_cache.h | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc index 796aeea..b3a6b2c 100644 --- a/net/http/http_cache.cc +++ b/net/http/http_cache.cc @@ -999,10 +999,9 @@ bool HttpCache::RemovePendingTransactionFromPendingOp(PendingOp* pending_op, void HttpCache::SetupQuicServerInfoFactory(HttpNetworkSession* session) { if (session && !session->quic_stream_factory()->has_quic_server_info_factory()) { - DCHECK(!quic_server_info_factory_); - quic_server_info_factory_.reset(new QuicServerInfoFactoryAdaptor(this)); + // QuicStreamFactory takes ownership of QuicServerInfoFactoryAdaptor. session->quic_stream_factory()->set_quic_server_info_factory( - quic_server_info_factory_.get()); + new QuicServerInfoFactoryAdaptor(this)); } } diff --git a/net/http/http_cache.h b/net/http/http_cache.h index 026d476..6c58e3a 100644 --- a/net/http/http_cache.h +++ b/net/http/http_cache.h @@ -418,8 +418,6 @@ class NET_EXPORT HttpCache : public HttpTransactionFactory, Mode mode_; - scoped_ptr<QuicServerInfoFactoryAdaptor> quic_server_info_factory_; - scoped_ptr<HttpTransactionFactory> network_layer_; scoped_ptr<disk_cache::Backend> disk_cache_; |