Move NULLing of OCSP context from UI thread to IO thread, to avoid possible r...

net/ocsp/nss_ocsp.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/ocsp/nss_ocsp.h"
 
 // Work around https://bugzilla.mozilla.org/show_bug.cgi?id=455424
 // until NSS 3.12.2 comes out and we update to it.
 #define Lock FOO_NSS_Lock
 #include <certt.h>
@@ skipping 32 matching lines @@
   MessageLoop* io_thread() const {
     DCHECK(io_loop_);
     return io_loop_;
   }
 
   // This is static method because it is called before NSS initialization,
   // that is, before OCSPInitSingleton is initialized.
   static void set_url_request_context(URLRequestContext* request_context) {
     request_context_ = request_context;
   }
-  URLRequestContext* url_request_context() const {
-    return request_context_.get();
+  static URLRequestContext* url_request_context() {
+    return request_context_;
   }
 
  private:
   friend struct DefaultSingletonTraits<OCSPInitSingleton>;
   OCSPInitSingleton();
   ~OCSPInitSingleton() {
     request_context_ = NULL;
   }
 
   SEC_HttpClientFcn client_fcn_;
 
   // I/O thread.
   MessageLoop* io_loop_;  // I/O thread
 
   // URLRequestContext for OCSP handlers.
-  static scoped_refptr<URLRequestContext> request_context_;
+  static URLRequestContext* request_context_;
 
   DISALLOW_COPY_AND_ASSIGN(OCSPInitSingleton);
 };
 
-scoped_refptr<URLRequestContext> OCSPInitSingleton::request_context_;
+URLRequestContext* OCSPInitSingleton::request_context_ = NULL;
 
 // Concrete class for SEC_HTTP_REQUEST_SESSION.
 // Public methods except virtual methods of URLRequest::Delegate (On* methods)
 // run on certificate verifier thread (worker thread).
 // Virtual methods of URLRequest::Delegate and private methods run
 // on IO thread.
 class OCSPRequestSession
     : public base::RefCountedThreadSafe<OCSPRequestSession>,
       public URLRequest::Delegate {
  public:
@@ skipping 437 matching lines @@
 
 void EnsureOCSPInit() {
   Singleton<OCSPInitSingleton>::get();
 }
 
 // This function would be called before NSS initialization.
 void SetURLRequestContextForOCSP(URLRequestContext* request_context) {
   OCSPInitSingleton::set_url_request_context(request_context);
 }
 
+URLRequestContext* GetURLRequestContextForOCSP() {
+  return OCSPInitSingleton::url_request_context();
+}
+
 }  // namespace net