Cleanup in base/test.

This is related to http://codereview.chromium.org/7003028/.

BUG=60476
TEST=None


Review URL: http://codereview.chromium.org/7129056

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89664 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 5 deletions

diff --git a/base/sys_string_conversions_unittest.cc b/base/sys_string_conversions_unittest.cc
index fa711f3..a3393ba 100644
--- a/base/sys_string_conversions_unittest.cc
+++ b/base/sys_string_conversions_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/string_piece.h"
-#include "base/test/test_util.h"
+#include "base/test/scoped_locale.h"
 #include "base/utf_string_conversions.h"
 #include "base/sys_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -77,7 +77,7 @@ TEST(SysStrings, SysUTF8ToWide) {
 
 TEST(SysStrings, SysWideToNativeMB) {
   using base::SysWideToNativeMB;
-  base::ScopedSetLocale locale("en_US.utf-8");
+  base::ScopedLocale locale("en_US.utf-8");
   EXPECT_EQ("Hello, world", SysWideToNativeMB(L"Hello, world"));
   EXPECT_EQ("\xe4\xbd\xa0\xe5\xa5\xbd", SysWideToNativeMB(L"\x4f60\x597d"));
 
@@ -108,7 +108,7 @@ TEST(SysStrings, SysWideToNativeMB) {
 // We assume the test is running in a UTF8 locale.
 TEST(SysStrings, SysNativeMBToWide) {
   using base::SysNativeMBToWide;
-  base::ScopedSetLocale locale("en_US.utf-8");
+  base::ScopedLocale locale("en_US.utf-8");
   EXPECT_EQ(L"Hello, world", SysNativeMBToWide("Hello, world"));
   EXPECT_EQ(L"\x4f60\x597d", SysNativeMBToWide("\xe4\xbd\xa0\xe5\xa5\xbd"));
   // >16 bits
@@ -162,7 +162,7 @@ static const wchar_t* const kConvertRoundtripCases[] = {
 
 
 TEST(SysStrings, SysNativeMBAndWide) {
-  base::ScopedSetLocale locale("en_US.utf-8");
+  base::ScopedLocale locale("en_US.utf-8");
   for (size_t i = 0; i < arraysize(kConvertRoundtripCases); ++i) {
     std::wstring wide = kConvertRoundtripCases[i];
     std::wstring trip = base::SysNativeMBToWide(base::SysWideToNativeMB(wide));