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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62105 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 10 insertions, 1 deletions

diff --git a/net/url_request/url_request_context.cc b/net/url_request/url_request_context.cc
index 329f83f..518d43a 100644
--- a/net/url_request/url_request_context.cc
+++ b/net/url_request/url_request_context.cc
@@ -16,7 +16,8 @@ URLRequestContext::URLRequestContext()
       http_auth_handler_factory_(NULL),
       network_delegate_(NULL),
       cookie_policy_(NULL),
-      transport_security_state_(NULL) {
+      transport_security_state_(NULL),
+      is_main_(false) {
 }
 
 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 96de77d..bbbae67 100644
--- a/net/url_request/url_request_context.h
+++ b/net/url_request/url_request_context.h
@@ -109,6 +109,11 @@ 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>;
 
@@ -137,6 +142,9 @@ class URLRequestContext
   std::string referrer_charset_;
 
  private:
+  // Indicates whether or not this is the main URLRequestContext.
+  bool is_main_;
+
   DISALLOW_COPY_AND_ASSIGN(URLRequestContext);
 };