diff options
| -rw-r--r-- | content/browser/browser_main_loop.cc | 4 | ||||
| -rw-r--r-- | net/base/net_util_unittest.cc | 3 |
2 files changed, 4 insertions, 3 deletions
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_); diff --git a/net/base/net_util_unittest.cc b/net/base/net_util_unittest.cc index 5a24a31..88c987e 100644 --- a/net/base/net_util_unittest.cc +++ b/net/base/net_util_unittest.cc @@ -1221,7 +1221,8 @@ TEST(NetUtilTest, GenerateFileName) { // don't match our expectations. std::string locale = setlocale(LC_CTYPE, NULL); StringToLowerASCII(&locale); - EXPECT_NE(std::string::npos, locale.find("utf-8")) + EXPECT_TRUE(locale.find("utf-8") != std::string::npos || + locale.find("utf8") != std::string::npos) << "Your locale (" << locale << ") must be set to UTF-8 " << "for this test to pass!"; #endif |