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

content/browser/browser_main_loop.cc

 // Copyright (c) 2012 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 "content/browser/browser_main_loop.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/hi_res_timer_manager.h"
@@ skipping 261 matching lines @@
 #endif
 
   if (parts_.get())
     parts_->PreEarlyInitialization();
 
 #if defined(OS_WIN)
   net::EnsureWinsockInit();
 #endif
 
 #if !defined(USE_OPENSSL)
-  // Use NSS for SSL by default.
-  // 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.

[wtc, 2013/01/15 23:50:22]

It is useful to keep the "Use NSS for SSL" part of the
original comment, so that we know why we need to initialize
NSPR.

[Ryan Sleevi, 2013/01/15 23:57:45]

We still need to initialize NSPR for Crypto - independent of the SSL bit. That's
why I removed it.

[wtc, 2013/01/16 00:36:03]

Ah, you're right.

+  crypto::EnsureNSPRInit();
 #endif  // !defined(USE_OPENSSL)
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
   SetupSandbox(parsed_command_line_);
 #endif
 
   if (parsed_command_line_.HasSwitch(switches::kEnableSSLCachedInfo))
     net::SSLConfigService::EnableCachedInfo();
 
   // TODO(abarth): Should this move to InitializeNetworkOptions?  This doesn't
@@ skipping 449 matching lines @@
   DCHECK_EQ(MessageLoop::TYPE_UI, MessageLoop::current()->type());
   if (parameters_.ui_task)
     MessageLoopForUI::current()->PostTask(FROM_HERE, *parameters_.ui_task);
 
   base::RunLoop run_loop;
   run_loop.Run();
 #endif
 }
 
 }  // namespace content