Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(631)

Unified Diff: net/url_request/url_request_context.cc

Issue 10299002: Stop refcounting URLRequestContext. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More fixes Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/url_request/url_request_context.cc
diff --git a/net/url_request/url_request_context.cc b/net/url_request/url_request_context.cc
index 1076f001275f6d4382fb42820536c06179683737..df7cd678a79217d3670f883cf58a0b6e93c9912f 100644
--- a/net/url_request/url_request_context.cc
+++ b/net/url_request/url_request_context.cc
@@ -16,8 +16,7 @@
namespace net {
URLRequestContext::URLRequestContext()
- : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
- net_log_(NULL),
+ : net_log_(NULL),
host_resolver_(NULL),
cert_verifier_(NULL),
server_bound_cert_service_(NULL),
@@ -35,6 +34,10 @@ URLRequestContext::URLRequestContext()
url_requests_(new std::set<const URLRequest*>) {
}
+URLRequestContext::~URLRequestContext() {
+ AssertNoURLRequests();
+}
+
void URLRequestContext::CopyFrom(URLRequestContext* other) {
// Copy URLRequestContext parameters.
set_net_log(other->net_log());
@@ -81,8 +84,4 @@ void URLRequestContext::AssertNoURLRequests() const {
}
}
-URLRequestContext::~URLRequestContext() {
- AssertNoURLRequests();
-}
-
} // namespace net

Powered by Google App Engine
This is Rietveld 408576698