summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-26 19:53:13 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-26 19:53:13 +0000
commitaeec733467e4958b8bcd45c8b278aff1ca9adde6 (patch)
tree1ae141bbc342aee0531747e5f1bcb1850002f02a
parenta024d0eb66ddf3c230f2fcefcdc67e38430e72ce (diff)
downloadchromium_src-aeec733467e4958b8bcd45c8b278aff1ca9adde6.zip
chromium_src-aeec733467e4958b8bcd45c8b278aff1ca9adde6.tar.gz
chromium_src-aeec733467e4958b8bcd45c8b278aff1ca9adde6.tar.bz2
Leaking locale changes is a Very Bad Idea.
BUG=298893,298900 TEST=tests stop failing R=cbentzel@chromium.org Review URL: https://codereview.chromium.org/24809002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225538 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/net/client_hints_unittest.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/net/client_hints_unittest.cc b/chrome/browser/net/client_hints_unittest.cc
index c93b3b6..828db69 100644
--- a/chrome/browser/net/client_hints_unittest.cc
+++ b/chrome/browser/net/client_hints_unittest.cc
@@ -4,9 +4,8 @@
#include "chrome/browser/net/client_hints.h"
-#include <locale.h>
-
#include "base/logging.h"
+#include "base/test/scoped_locale.h"
#include "testing/gtest/include/gtest/gtest.h"
class ClientHintsTest : public testing::Test {
@@ -26,7 +25,7 @@ TEST_F(ClientHintsTest, HintsWellFormatted) {
}
TEST_F(ClientHintsTest, HintsWellFormattedWithNonEnLocale) {
- setlocale(LC_ALL, "fr_FR.UTF-8");
+ base::ScopedLocale locale("fr_FR.UTF-8");
UpdateScreenInfo(1.567f);
std::string hint = client_hints_.GetDevicePixelRatioHeader();
EXPECT_EQ("1.57", hint);