summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_main_win.cc
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-10 04:08:53 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-10 04:08:53 +0000
commitbaa0e49ce97e6e2b14a05a4039be9aa0c43d3be7 (patch)
tree297ee5e02a056ea621e51bcb6ab906352e2b9b09 /chrome/browser/browser_main_win.cc
parent148a5eed11fd7a04f09c28f7553d19924325c821 (diff)
downloadchromium_src-baa0e49ce97e6e2b14a05a4039be9aa0c43d3be7.zip
chromium_src-baa0e49ce97e6e2b14a05a4039be9aa0c43d3be7.tar.gz
chromium_src-baa0e49ce97e6e2b14a05a4039be9aa0c43d3be7.tar.bz2
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68827 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main_win.cc')
-rw-r--r--chrome/browser/browser_main_win.cc4
1 files changed, 4 insertions, 0 deletions
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
}
};