Revert 68827 - Use SChannel for Windows....

chrome/browser/browser_main_win.cc

 // Copyright (c) 2010 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 "chrome/browser/browser_main.h"
 #include "chrome/browser/browser_main_win.h"
 
 #include <windows.h>
 #include <shellapi.h>
 
@@ skipping 222 matching lines @@
       l10n_util::OverrideLocaleWithUILanguageList();
     }
   }
 
  private:
   virtual void InitializeSSL() {
     // Use NSS for SSL by default.
     // Because of a build system issue (http://crbug.com/43461), the default
     // client socket factory uses SChannel (the system SSL library) for SSL by
     // default on Windows.
-
-    // Disabling this temporarily to test out if NSS is causing heap corruption.
-#if 0
     if (!parsed_command_line().HasSwitch(switches::kUseSystemSSL)) {
       net::ClientSocketFactory::SetSSLClientSocketFactory(
           net::SSLClientSocketNSSFactory);
       // We want to be sure to init NSPR on the main thread.
       base::EnsureNSPRInit();
     }
-#endif
   }
 };
 
 // static
 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts(
     const MainFunctionParams& parameters) {
   return new BrowserMainPartsWin(parameters);
 }