diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-14 22:13:43 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-14 22:13:43 +0000 |
| commit | c1b9277f706fb46cfe8a492ab8b95316955b302c (patch) | |
| tree | 4495aeb721dca11ba3aca25b6eb63b99efc6ebf6 /chrome/browser/browser_main_win.cc | |
| parent | 1eb8f43fd9d3220607ba96e5ddd8dec3ac5acb45 (diff) | |
| download | chromium_src-c1b9277f706fb46cfe8a492ab8b95316955b302c.zip chromium_src-c1b9277f706fb46cfe8a492ab8b95316955b302c.tar.gz chromium_src-c1b9277f706fb46cfe8a492ab8b95316955b302c.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69190 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main_win.cc')
| -rw-r--r-- | chrome/browser/browser_main_win.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/chrome/browser/browser_main_win.cc b/chrome/browser/browser_main_win.cc index 66f6c6e..273a113 100644 --- a/chrome/browser/browser_main_win.cc +++ b/chrome/browser/browser_main_win.cc @@ -240,16 +240,12 @@ 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 } }; |