Remove support for 'system' SSL on Mac (SecureTransport) and Win (SChannel)

content/browser/browser_main_loop.cc

Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 255e63a3eceb6309456daaeaa7027b1941e10313..353ba61c8cf7248b794d769abe7225008286700f 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -280,23 +280,8 @@ void BrowserMainLoop::EarlyInitialization() {
 
 #if !defined(USE_OPENSSL)
   // Use NSS for SSL by default.

[wtc, 2013/01/15 23:26:35]

Remove "by default", which means "if --use-system-ssl is not
specified" rather than "if USE_OPENSSL is not defined".

-  // The default client socket factory uses NSS for SSL by default on
-  // Windows and Mac.
-  bool init_nspr = false;
-#if defined(OS_WIN) || defined(OS_MACOSX)
-  if (parsed_command_line_.HasSwitch(switches::kUseSystemSSL)) {
-    net::ClientSocketFactory::UseSystemSSL();
-  } else {
-    init_nspr = true;
-  }
-  UMA_HISTOGRAM_BOOLEAN("Chrome.CommandLineUseSystemSSL", !init_nspr);
-#elif defined(USE_NSS)
-  init_nspr = true;
-#endif
-  if (init_nspr) {
-    // We want to be sure to init NSPR on the main thread.
-    crypto::EnsureNSPRInit();
-  }
+  // We want to be sure to init NSPR on the main thread.
+  crypto::EnsureNSPRInit();
 #endif  // !defined(USE_OPENSSL)
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)