Remove the workaround for bug 43461. Use a g_use_system_ssl...

chrome/browser/browser_main_win.cc

 // Copyright (c) 2011 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 16 matching lines @@
 #include "chrome/common/env_vars.h"
 #include "chrome/common/main_function_params.h"
 #include "chrome/common/result_codes.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/helper.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/shell_util.h"
 #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 "net/socket/client_socket_factory.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/message_box_win.h"
 #include "views/focus/accelerator_handler.h"
 #include "views/window/window.h"
 
 namespace {
 typedef HRESULT (STDAPICALLTYPE* RegisterApplicationRestartProc)(
     const wchar_t* command_line,
     DWORD flags);
@@ skipping 215 matching lines @@
     // has already been initialized.
     if (!parameters().ui_task) {
       // Override the configured locale with the user's preferred UI language.
       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.
-    if (!parsed_command_line().HasSwitch(switches::kUseSystemSSL)) {
-      net::ClientSocketFactory::SetSSLClientSocketFactory(
-          net::SSLClientSocketNSSFactory);
+    // The default client socket factory uses NSS for SSL by default on
+    // Windows.
+    if (parsed_command_line().HasSwitch(switches::kUseSystemSSL)) {
+      net::ClientSocketFactory::UseSystemSSL();
+    } else {
       // We want to be sure to init NSPR on the main thread.
       base::EnsureNSPRInit();
     }
   }
 };
 
 // static
 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts(
     const MainFunctionParams& parameters) {
   return new BrowserMainPartsWin(parameters);
 }