BrowserMain() refactoring, part 2.1.

chrome/browser/browser_main_win.cc

Index: chrome/browser/browser_main_win.cc
diff --git a/chrome/browser/browser_main_win.cc b/chrome/browser/browser_main_win.cc
index b76545a34e0b340aaff330cbea2b73506f5681f4..08ec951eb8cba82973480d9d06d28617b4b982fe 100644
--- a/chrome/browser/browser_main_win.cc
+++ b/chrome/browser/browser_main_win.cc
@@ -15,6 +15,7 @@
 #include "app/win_util.h"
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
+#include "base/nss_util.h"
 #include "base/path_service.h"
 #include "base/win_util.h"
 #include "chrome/browser/browser_list.h"
@@ -30,6 +31,7 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "net/base/winsock_init.h"
+#include "net/socket/ssl_client_socket_nss_factory.h"
 #include "views/focus/accelerator_handler.h"
 #include "views/window/window.h"
 
@@ -216,6 +218,20 @@ class BrowserMainPartsWin : public BrowserMainParts {
   virtual void PreMainMessageLoopStart() {
     OleInitialize(NULL);
   }
+
+ 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.
+    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();
+    }
+  }
 };
 
 // static