diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-23 21:35:19 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-23 21:35:19 +0000 |
| commit | 2380f378654e66f58262e3eaa1f9ba0cd1da09e0 (patch) | |
| tree | cd9202c3cfd4a88a619604a7d59ee3184b94a29b /chrome | |
| parent | b4ce3c22d957e8c6128e7e1dd7434b5cd0e61008 (diff) | |
| download | chromium_src-2380f378654e66f58262e3eaa1f9ba0cd1da09e0.zip chromium_src-2380f378654e66f58262e3eaa1f9ba0cd1da09e0.tar.gz chromium_src-2380f378654e66f58262e3eaa1f9ba0cd1da09e0.tar.bz2 | |
Remove the workaround for bug 43461. Use a g_use_system_ssl
boolean flag in DefaultClientSocketFactory::CreateSSLClientSocket.
Based on rch's code in http://codereview.chromium.org/6487012.
R=rch
BUG=43461
TEST=no ChromeFrame test program build failures.
Review URL: http://codereview.chromium.org/6561003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75791 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/browser_main_mac.mm | 5 | ||||
| -rw-r--r-- | chrome/browser/browser_main_win.cc | 13 |
2 files changed, 8 insertions, 10 deletions
diff --git a/chrome/browser/browser_main_mac.mm b/chrome/browser/browser_main_mac.mm index e47e268..15ee489 100644 --- a/chrome/browser/browser_main_mac.mm +++ b/chrome/browser/browser_main_mac.mm @@ -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 @@ class BrowserMainPartsMac : public BrowserMainPartsPosix { // 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(); diff --git a/chrome/browser/browser_main_win.cc b/chrome/browser/browser_main_win.cc index 8689e39..2824d01 100644 --- a/chrome/browser/browser_main_win.cc +++ b/chrome/browser/browser_main_win.cc @@ -34,7 +34,7 @@ #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" @@ -270,12 +270,11 @@ class BrowserMainPartsWin : public BrowserMainParts { 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(); } |