Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3323)

Unified Diff: chrome/browser/browser_main_mac.mm

Issue 6561003: Remove the workaround for bug 43461. Use a g_use_system_ssl... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/browser_main_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_main_mac.mm
===================================================================
--- chrome/browser/browser_main_mac.mm (revision 75692)
+++ chrome/browser/browser_main_mac.mm (working copy)
@@ -24,7 +24,7 @@
#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"
@@ -135,8 +135,7 @@
// 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();
« no previous file with comments | « no previous file | chrome/browser/browser_main_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698