summaryrefslogtreecommitdiffstats
path: root/ios/crnet
diff options
context:
space:
mode:
authormmenke <mmenke@chromium.org>2015-09-11 13:42:27 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-11 20:43:11 +0000
commit468be2ff331c13b1a081d10a3c17e5366d26e577 (patch)
treecee2dbcb52ab7a5af00b531b8e614255a88c7ba6 /ios/crnet
parent7c54a1d92f5d20997f58cdc70bd5b51a4a77efee (diff)
downloadchromium_src-468be2ff331c13b1a081d10a3c17e5366d26e577.zip
chromium_src-468be2ff331c13b1a081d10a3c17e5366d26e577.tar.gz
chromium_src-468be2ff331c13b1a081d10a3c17e5366d26e577.tar.bz2
Remove reference counting from HttpNetworkSession.
This makes lifetime cleaner, and helps us avoid the case where an HttpNetworkSession outlives the components it points to. Also remove some weird uses a null NetLog in GCM. TBR=sgurun@chromium.org,davidben@chromium.org,droger@chromium.org BUG=515947 Review URL: https://codereview.chromium.org/1298253002 Cr-Commit-Position: refs/heads/master@{#348483}
Diffstat (limited to 'ios/crnet')
-rw-r--r--ios/crnet/crnet_environment.mm7
1 files changed, 6 insertions, 1 deletions
diff --git a/ios/crnet/crnet_environment.mm b/ios/crnet/crnet_environment.mm
index 3eb873a..516d2e8 100644
--- a/ios/crnet/crnet_environment.mm
+++ b/ios/crnet/crnet_environment.mm
@@ -446,7 +446,12 @@ void CrNetEnvironment::InitializeOnNetworkThread() {
base::WorkerPool::GetTaskRunner(true));
}
- net::HttpCache* main_cache = new net::HttpCache(params, main_backend);
+ // TODO(mmenke): These really shouldn't be leaked.
+ // See https://crbug.com/523858.
+ net::HttpNetworkSession* http_network_session =
+ new net::HttpNetworkSession(params);
+ net::HttpCache* main_cache = new net::HttpCache(
+ http_network_session, main_backend, true /* set_up_quic_server_info */);
main_context_->set_http_transaction_factory(main_cache);
// Cookies