Reland fix for OCSP startup race.

chrome/browser/net/chrome_url_request_context.cc

Index: chrome/browser/net/chrome_url_request_context.cc
diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc
index 9f053f319602b65281994b20f10c24187500ffa1..28f76217f276b47faead438c2ede16222d72148f 100644
--- a/chrome/browser/net/chrome_url_request_context.cc
+++ b/chrome/browser/net/chrome_url_request_context.cc
@@ -314,11 +314,6 @@ ChromeURLRequestContext* FactoryForOriginal::Create() {
 
   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;
 }
@@ -559,6 +554,14 @@ URLRequestContext* ChromeURLRequestContextGetter::GetURLRequestContext() {
   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();
   }
 
@@ -756,7 +759,8 @@ ChromeURLRequestContext::~ChromeURLRequestContext() {
   }
 
 #if defined(USE_NSS)
-  if (this == net::GetURLRequestContextForOCSP()) {
+  if (is_main()) {
+    DCHECK_EQ(this, net::GetURLRequestContextForOCSP());
     // We are releasing the URLRequestContext used by OCSP handlers.
     net::SetURLRequestContextForOCSP(NULL);
   }