Revert 60739 (still leaks on ChromiumOS!) - Reland r59972: Eagerly set the IO...

chrome/browser/net/chrome_url_request_context.cc

Index: chrome/browser/net/chrome_url_request_context.cc
===================================================================
--- chrome/browser/net/chrome_url_request_context.cc	(revision 60752)
+++ chrome/browser/net/chrome_url_request_context.cc	(working copy)
@@ -313,6 +313,11 @@
 
   appcache_service_->set_request_context(context);
 
+#if defined(USE_NSS)
+  // TODO(ukai): find a better way to set the URLRequestContext for OCSP.
+  net::SetURLRequestContextForOCSP(context);
+#endif
+
   context->set_net_log(io_thread_globals->net_log.get());
   return context;
 }
@@ -552,14 +557,6 @@
   if (!url_request_context_) {
     DCHECK(factory_.get());
     url_request_context_ = factory_->Create();
-    if (is_main()) {
-      url_request_context_->set_is_main(true);
-#if defined(USE_NSS)
-      // TODO(ukai): find a better way to set the URLRequestContext for OCSP.
-      net::SetURLRequestContextForOCSP(url_request_context_);
-#endif
-    }
-
     factory_.reset();
   }
 
@@ -774,8 +771,7 @@
   }
 
 #if defined(USE_NSS)
-  if (is_main()) {
-    DCHECK_EQ(this, net::GetURLRequestContextForOCSP());
+  if (this == net::GetURLRequestContextForOCSP()) {
     // We are releasing the URLRequestContext used by OCSP handlers.
     net::SetURLRequestContextForOCSP(NULL);
   }