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

chrome/browser/browser_main_mac.mm

 // 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_posix.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "app/app_switches.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "base/file_path.h"
 #include "base/mac/mac_util.h"
 #include "base/nss_util.h"
 #include "base/path_service.h"
 #include "base/scoped_nsobject.h"
 #include "chrome/app/breakpad_mac.h"
 #import "chrome/browser/app_controller_mac.h"
 #include "chrome/browser/browser_main_win.h"
 #import "chrome/browser/chrome_browser_application_mac.h"
 #import "chrome/browser/cocoa/keystone_glue.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/main_function_params.h"
 #include "chrome/common/result_codes.h"
-#include "net/socket/ssl_client_socket_mac_factory.h"
+#include "net/socket/client_socket_factory.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/resource/resource_bundle.h"
 
 void DidEndMainMessageLoop() {
   AppController* appController = [NSApp delegate];
   [appController didEndMainMessageLoop];
 }
 
 void RecordBreakpadStatusUMA(MetricsService* metrics) {
   metrics->RecordBreakpadRegistration(IsCrashReporterEnabled());
@@ skipping 90 matching lines @@
     // |-application:openFiles:|, since we already handle them directly.
     [[NSUserDefaults standardUserDefaults]
         setObject:@"NO" forKey:@"NSTreatUnknownArgumentsAsOpen"];
   }
 
  private:
   virtual void InitializeSSL() {
     // Use NSS for SSL by default.
     // The default client socket factory uses NSS for SSL by default on Mac.
     if (parsed_command_line().HasSwitch(switches::kUseSystemSSL)) {
-      net::ClientSocketFactory::SetSSLClientSocketFactory(
-          net::SSLClientSocketMacFactory);
+      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 BrowserMainPartsMac(parameters);
 }