summaryrefslogtreecommitdiffstats
path: root/net/url_request
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-10 06:10:51 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-10 06:10:51 +0000
commit8bd001c65bac6b78566dc11009767a40d260aeff (patch)
tree63394d49cdaacc98dee88256e0b8d72a3e576d08 /net/url_request
parent0aa26f4be3c0590ca2876f017e6ad4f244dd35e3 (diff)
downloadchromium_src-8bd001c65bac6b78566dc11009767a40d260aeff.zip
chromium_src-8bd001c65bac6b78566dc11009767a40d260aeff.tar.gz
chromium_src-8bd001c65bac6b78566dc11009767a40d260aeff.tar.bz2
Revert 62105 - Test change to fix a leak. Will revert after getting in a run on ChromiumOS valgrind bots.
Revert "Revert 60739 (still leaks on ChromiumOS!) - Reland r59972: Eagerly set the IO loop used for OCSP." Review URL: http://codereview.chromium.org/3681003 TBR=willchan@chromium.org Review URL: http://codereview.chromium.org/3669003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62107 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 518d43a..329f83f 100644
--- a/net/url_request/url_request_context.cc
+++ b/net/url_request/url_request_context.cc
@@ -16,8 +16,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 bbbae67..96de77d 100644
--- a/net/url_request/url_request_context.h
+++ b/net/url_request/url_request_context.h
@@ -109,11 +109,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_ = is_main; }
-
protected:
friend class base::RefCountedThreadSafe<URLRequestContext>;
@@ -142,9 +137,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);
};