Chromium Code Reviews| Index: chrome/browser/browser_main_win.cc |
| =================================================================== |
| --- chrome/browser/browser_main_win.cc (revision 75583) |
| +++ chrome/browser/browser_main_win.cc (working copy) |
| @@ -270,12 +270,10 @@ |
| 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 Win. |
|
wtc
2011/02/23 00:38:38
Nit: Win => 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(); |
| } |