Remove DisableOCSP().

net/ocsp/nss_ocsp.cc

 // Copyright (c) 2011 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"
 
 #include <certt.h>
 #include <certdb.h>
 #include <ocsp.h>
 #include <nspr.h>
@@ skipping 23 matching lines @@
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 
 namespace {
 
 // Protects |g_request_context|.
 pthread_mutex_t g_request_context_lock = PTHREAD_MUTEX_INITIALIZER;
 static net::URLRequestContext* g_request_context = NULL;
 
-static bool g_disable_ocsp = false;
-
 class OCSPRequestSession;
 
 class OCSPIOLoop {
  public:
   void StartUsing() {
     base::AutoLock autolock(lock_);
     used_ = true;
   }
 
   // Called on IO loop.
@@ skipping 848 matching lines @@
   }
 
   return NULL;
 }
 
 }  // anonymous namespace
 
 namespace net {
 
 void SetMessageLoopForOCSP() {
-  // Must not be called when OCSP is disabled.
-  DCHECK(!g_disable_ocsp);
-
   // Must have a MessageLoopForIO.
   DCHECK(MessageLoopForIO::current());
 
   bool used = g_ocsp_io_loop.Get().used();
 
   // Should not be called when g_ocsp_io_loop has already been used.
   DCHECK(!used);
 }
 
-void DisableOCSP() {
-  g_disable_ocsp = true;
-}
-
 void EnsureOCSPInit() {
-  if (!g_disable_ocsp) {
-    g_ocsp_io_loop.Get().StartUsing();
-    g_ocsp_nss_initialization.Get();
-  }
+  g_ocsp_io_loop.Get().StartUsing();
+  g_ocsp_nss_initialization.Get();
 }
 
 void ShutdownOCSP() {
-  if (!g_disable_ocsp)
-    g_ocsp_io_loop.Get().Shutdown();
+  g_ocsp_io_loop.Get().Shutdown();
 }
 
 // This function would be called before NSS initialization.
 void SetURLRequestContextForOCSP(URLRequestContext* request_context) {
-  // Must not be called when OCSP is disabled.
-  DCHECK(!g_disable_ocsp);
-
   pthread_mutex_lock(&g_request_context_lock);
   if (request_context) {
     DCHECK(!g_request_context);
   }
   g_request_context = request_context;
   pthread_mutex_unlock(&g_request_context_lock);
 }
 
 }  // namespace net