net: always enable NSS's HTTP fetches

chrome/browser/io_thread.cc

Index: chrome/browser/io_thread.cc
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 498a4e41532213e370e7ad7ba9a209c11482610b..315f25d3aa9a52cfc287bea972e20f8e81478b5a 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -88,14 +88,14 @@ class SystemURLRequestContext : public URLRequestContextWithUserAgent {
  public:
   SystemURLRequestContext() {
 #if defined(USE_NSS)
-    net::SetURLRequestContextForOCSP(this);
+    net::SetURLRequestContextForNssPkixIO(this);
 #endif  // defined(USE_NSS)
   }
 
  private:
   virtual ~SystemURLRequestContext() {
 #if defined(USE_NSS)
-    net::SetURLRequestContextForOCSP(NULL);
+    net::SetURLRequestContextForNssPkixIO(NULL);
 #endif  // defined(USE_NSS)
   }
 };
@@ -371,7 +371,7 @@ void IOThread::Init() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
 #if defined(USE_NSS)
-  net::SetMessageLoopForOCSP();
+  net::SetMessageLoopForNssPkixIO();
 #endif  // defined(USE_NSS)
 
   DCHECK(!globals_);
@@ -470,7 +470,7 @@ void IOThread::CleanUp() {
   sdch_manager_ = NULL;
 
 #if defined(USE_NSS)
-  net::ShutdownOCSP();
+  net::ShutdownNssPkixIO();
 #endif  // defined(USE_NSS)
 
   system_url_request_context_getter_ = NULL;