From 8069898eb2c5511ed83ed6677380f14cfd04d3a0 Mon Sep 17 00:00:00 2001 From: "willchan@chromium.org" Date: Tue, 14 Dec 2010 23:20:10 +0000 Subject: Revert 69190 - Revert 68827 - Use SChannel for Windows. Test to see if this stops memory corruption crashes, will revert after a canary release. BUG=65948 TEST=none Review URL: http://codereview.chromium.org/5733003 TBR=willchan@chromium.org Review URL: http://codereview.chromium.org/5805005 TBR=willchan@chromium.org Review URL: http://codereview.chromium.org/5835001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69196 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/browser_main_win.cc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'chrome/browser/browser_main_win.cc') diff --git a/chrome/browser/browser_main_win.cc b/chrome/browser/browser_main_win.cc index 273a113..66f6c6e 100644 --- a/chrome/browser/browser_main_win.cc +++ b/chrome/browser/browser_main_win.cc @@ -240,12 +240,16 @@ class BrowserMainPartsWin : public BrowserMainParts { // 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. + + // Disabling this temporarily to test out if NSS is causing heap corruption. +#if 0 if (!parsed_command_line().HasSwitch(switches::kUseSystemSSL)) { net::ClientSocketFactory::SetSSLClientSocketFactory( net::SSLClientSocketNSSFactory); // We want to be sure to init NSPR on the main thread. base::EnsureNSPRInit(); } +#endif } }; -- cgit v1.1