From 1648b290abe12461fafd9c1fa6e3104fb127d511 Mon Sep 17 00:00:00 2001 From: "joth@chromium.org" Date: Thu, 3 Nov 2011 23:57:39 +0000 Subject: Fix a couple minor net issues - crypto::EnsureNSPRInit does not exist on use_openssl builds - on my machine the locale is en_us.utf8 which makes NetUtilTest.GenerateFileName fail BUG=None TEST=can build the browser for use_openssl=1; "LANG=utf8 net_unittests" passes Review URL: http://codereview.chromium.org/8334033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108582 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/browser_main_loop.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'content') diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index 8c2d58f..95f3de0 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc @@ -178,12 +178,11 @@ void BrowserMainLoop::EarlyInitialization() { for (size_t i = 0; i < parts_list_.size(); ++i) parts_list_[i]->PreEarlyInitialization(); - // Start watching for jank during shutdown. It gets disarmed when - #if defined(OS_WIN) net::EnsureWinsockInit(); #endif +#if !defined(USE_OPENSSL) // Use NSS for SSL by default. // The default client socket factory uses NSS for SSL by default on // Windows and Mac. @@ -201,6 +200,7 @@ void BrowserMainLoop::EarlyInitialization() { // We want to be sure to init NSPR on the main thread. crypto::EnsureNSPRInit(); } +#endif // !defined(USE_OPENSSL) #if defined(OS_POSIX) && !defined(OS_MACOSX) SetupSandbox(parsed_command_line_); -- cgit v1.1