summaryrefslogtreecommitdiffstats
path: root/google_apis
diff options
context:
space:
mode:
authorzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-11 05:03:20 +0000
committerzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-11 05:03:20 +0000
commitb52c239424acc212a50cc948159f33366dec43e4 (patch)
treef4984fadad55f8e1e69835edf58ed1a1d3773047 /google_apis
parent4939383c95030cf963cf5a70ede23c57b212baa4 (diff)
downloadchromium_src-b52c239424acc212a50cc948159f33366dec43e4.zip
chromium_src-b52c239424acc212a50cc948159f33366dec43e4.tar.gz
chromium_src-b52c239424acc212a50cc948159f33366dec43e4.tar.bz2
[GCM] Close the socket on connection factory shutdown
We don't want to attempt to reuse a socket across shutdowns, and given socket pools any open socket can be reused. Make sure to close the socket on shutdown BUG=392546 Review URL: https://codereview.chromium.org/381273003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282551 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'google_apis')
-rw-r--r--google_apis/gcm/engine/connection_factory_impl.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/google_apis/gcm/engine/connection_factory_impl.cc b/google_apis/gcm/engine/connection_factory_impl.cc
index b1a43da..0ff3175 100644
--- a/google_apis/gcm/engine/connection_factory_impl.cc
+++ b/google_apis/gcm/engine/connection_factory_impl.cc
@@ -67,6 +67,7 @@ ConnectionFactoryImpl::ConnectionFactoryImpl(
}
ConnectionFactoryImpl::~ConnectionFactoryImpl() {
+ CloseSocket();
net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
if (pac_request_) {
network_session_->proxy_service()->CancelPacRequest(pac_request_);