summaryrefslogtreecommitdiffstats
path: root/net/url_request
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-21 06:13:49 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-21 06:13:49 +0000
commit1684c609b8b60ddbd9161c42ded842dd1f62a667 (patch)
treee2ad717655f6230bd4347800fb4d19f203838c25 /net/url_request
parentdd54818d366e7050298af022a8c913c2262ca64a (diff)
downloadchromium_src-1684c609b8b60ddbd9161c42ded842dd1f62a667.zip
chromium_src-1684c609b8b60ddbd9161c42ded842dd1f62a667.tar.gz
chromium_src-1684c609b8b60ddbd9161c42ded842dd1f62a667.tar.bz2
Revert 59972 (chromium os leaks) - Reland r59511: Eagerly set the IO loop used for OCSP.
ChromeOS will create a special Profile for login. Previously, OCSP initialization was done for the "default" ChromeURLRequestContext for each Profile. Since we can have multiple profiles, this causes the initialization (and uninitialization) to happen multiple times, which causes problems for OCSP since we use statics. The solution is to identify the "main" Profile. We create said Profile in BrowserMain. I add an "is_main_" variable to URLRequestContextGetter and URLRequestContext, so that only the "main" URLRequestContext will initialize OCSP. Other than minor plumbing of "is_main_", this changelist is identical to r59511. BUG=55940 TEST=Startup ChromeOS's Chrome. Should not crash on startup. Review URL: http://codereview.chromium.org/3470001 TBR=willchan@chromium.org Review URL: http://codereview.chromium.org/3468005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60025 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request')
-rw-r--r--net/url_request/url_request_context.cc3
-rw-r--r--net/url_request/url_request_context.h8
2 files changed, 1 insertions, 10 deletions
diff --git a/net/url_request/url_request_context.cc b/net/url_request/url_request_context.cc
index 5c50bbb..0ea8477 100644
--- a/net/url_request/url_request_context.cc
+++ b/net/url_request/url_request_context.cc
@@ -15,8 +15,7 @@ URLRequestContext::URLRequestContext()
http_auth_handler_factory_(NULL),
network_delegate_(NULL),
cookie_policy_(NULL),
- transport_security_state_(NULL),
- is_main_(false) {
+ transport_security_state_(NULL) {
}
const std::string& URLRequestContext::GetUserAgent(const GURL& url) const {
diff --git a/net/url_request/url_request_context.h b/net/url_request/url_request_context.h
index 7273429..6ddc940 100644
--- a/net/url_request/url_request_context.h
+++ b/net/url_request/url_request_context.h
@@ -104,11 +104,6 @@ class URLRequestContext
referrer_charset_ = charset;
}
- // Controls whether or not the URLRequestContext considers itself to be the
- // "main" URLRequestContext.
- bool is_main() const { return is_main_; }
- void set_is_main(bool is_main) { is_main_ = true; }
-
protected:
friend class base::RefCountedThreadSafe<URLRequestContext>;
@@ -136,9 +131,6 @@ class URLRequestContext
std::string referrer_charset_;
private:
- // Indicates whether or not this is the main URLRequestContext.
- bool is_main_;
-
DISALLOW_COPY_AND_ASSIGN(URLRequestContext);
};