diff options
| author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-03 23:57:39 +0000 |
|---|---|---|
| committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-03 23:57:39 +0000 |
| commit | 1648b290abe12461fafd9c1fa6e3104fb127d511 (patch) | |
| tree | 317911e24b07f21e7e12920546b81eb6e13af2c9 /net | |
| parent | d640844bf9749b53ac7c566d567dbc1f60461cf6 (diff) | |
| download | chromium_src-1648b290abe12461fafd9c1fa6e3104fb127d511.zip chromium_src-1648b290abe12461fafd9c1fa6e3104fb127d511.tar.gz chromium_src-1648b290abe12461fafd9c1fa6e3104fb127d511.tar.bz2 | |
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
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/net_util_unittest.cc | 3 |
1 files changed, 2 insertions, 1 deletions
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 |