summaryrefslogtreecommitdiffstats
path: root/net/url_request
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-11 03:12:20 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-11 03:12:20 +0000
commit241e3a43f2dc6227bfaebbc5bc2d9685e47ae00f (patch)
tree895efb283e2170a2df5f6215b34bfe60066494e4 /net/url_request
parent0dc7ff9a0740df95164d6a524ed2e5ccf0d85e6f (diff)
downloadchromium_src-241e3a43f2dc6227bfaebbc5bc2d9685e47ae00f.zip
chromium_src-241e3a43f2dc6227bfaebbc5bc2d9685e47ae00f.tar.gz
chromium_src-241e3a43f2dc6227bfaebbc5bc2d9685e47ae00f.tar.bz2
Fix leak of HttpServerProperties in URLRequestContextStorage.
BUG=none TEST=none Review URL: http://codereview.chromium.org/8222022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104840 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request')
-rw-r--r--net/url_request/url_request_context_storage.cc2
-rw-r--r--net/url_request/url_request_context_storage.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/url_request/url_request_context_storage.cc b/net/url_request/url_request_context_storage.cc
index 337f3ad..a455cf3 100644
--- a/net/url_request/url_request_context_storage.cc
+++ b/net/url_request/url_request_context_storage.cc
@@ -89,7 +89,7 @@ void URLRequestContextStorage::set_network_delegate(
void URLRequestContextStorage::set_http_server_properties(
HttpServerProperties* http_server_properties) {
context_->set_http_server_properties(http_server_properties);
- http_server_properties_ = http_server_properties;
+ http_server_properties_.reset(http_server_properties);
}
void URLRequestContextStorage::set_cookie_store(CookieStore* cookie_store) {
diff --git a/net/url_request/url_request_context_storage.h b/net/url_request/url_request_context_storage.h
index 7449766..b96efc9 100644
--- a/net/url_request/url_request_context_storage.h
+++ b/net/url_request/url_request_context_storage.h
@@ -84,7 +84,7 @@ class NET_EXPORT URLRequestContextStorage {
// TODO(willchan): Remove refcounting on these members.
scoped_refptr<SSLConfigService> ssl_config_service_;
scoped_ptr<NetworkDelegate> network_delegate_;
- HttpServerProperties* http_server_properties_;
+ scoped_ptr<HttpServerProperties> http_server_properties_;
scoped_refptr<CookieStore> cookie_store_;
scoped_ptr<TransportSecurityState> transport_security_state_;