Revert 89664 - Cleanup in base/test.

base/sys_string_conversions_unittest.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2008 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.
 
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/string_piece.h"
-#include "base/test/scoped_locale.h"
+#include "base/test/test_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/sys_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #ifdef WCHAR_T_IS_UTF32
 static const std::wstring kSysWideOldItalicLetterA = L"\x10300";
 #else
 static const std::wstring kSysWideOldItalicLetterA = L"\xd800\xdf00";
 #endif
 
@@ skipping 49 matching lines @@
   expected_null.push_back(0);
   expected_null.push_back('b');
 
   EXPECT_EQ(expected_null, SysUTF8ToWide(utf8_null));
 }
 
 #if defined(OS_LINUX)  // Tests depend on setting a specific Linux locale.
 
 TEST(SysStrings, SysWideToNativeMB) {
   using base::SysWideToNativeMB;
-  base::ScopedLocale locale("en_US.utf-8");
+  base::ScopedSetLocale 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"));
 
   // >16 bits
   EXPECT_EQ("\xF0\x90\x8C\x80", SysWideToNativeMB(kSysWideOldItalicLetterA));
 
   // Error case. When Windows finds a UTF-16 character going off the end of
   // a string, it just converts that literal value to UTF-8, even though this
   // is invalid.
   //
@@ skipping 10 matching lines @@
   std::string expected_null("a");
   expected_null.push_back(0);
   expected_null.push_back('b');
 
   EXPECT_EQ(expected_null, SysWideToNativeMB(wide_null));
 }
 
 // We assume the test is running in a UTF8 locale.
 TEST(SysStrings, SysNativeMBToWide) {
   using base::SysNativeMBToWide;
-  base::ScopedLocale locale("en_US.utf-8");
+  base::ScopedSetLocale 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
   EXPECT_EQ(kSysWideOldItalicLetterA, SysNativeMBToWide("\xF0\x90\x8C\x80"));
 
   // Error case. When Windows finds an invalid UTF-8 character, it just skips
   // it. This seems weird because it's inconsistent with the reverse conversion.
   //
   // This is what XP does, but Vista has different behavior, so we don't bother
   // verifying it:
@@ skipping 33 matching lines @@
   L"\xd807\xdd40\xd807\xdd41\xd807\xdd42\xd807\xdd43\xd807\xdd44",
 #elif defined(WCHAR_T_IS_UTF32)
   L"\x10300",
   // ?????  (Mathematical Alphanumeric Symbols (U+011d40 - U+011d44 : A,B,C,D,E)
   L"\x11d40\x11d41\x11d42\x11d43\x11d44",
 #endif
 };
 
 
 TEST(SysStrings, SysNativeMBAndWide) {
-  base::ScopedLocale locale("en_US.utf-8");
+  base::ScopedSetLocale 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));
     EXPECT_EQ(wide.size(), trip.size());
     EXPECT_EQ(wide, trip);
   }
 
   // We assume our test is running in UTF-8, so double check through ICU.
   for (size_t i = 0; i < arraysize(kConvertRoundtripCases); ++i) {
     std::wstring wide = kConvertRoundtripCases[i];
     std::wstring trip = base::SysNativeMBToWide(WideToUTF8(wide));
     EXPECT_EQ(wide.size(), trip.size());
     EXPECT_EQ(wide, trip);
   }
 
   for (size_t i = 0; i < arraysize(kConvertRoundtripCases); ++i) {
     std::wstring wide = kConvertRoundtripCases[i];
     std::wstring trip = UTF8ToWide(base::SysWideToNativeMB(wide));
     EXPECT_EQ(wide.size(), trip.size());
     EXPECT_EQ(wide, trip);
   }
 }
 #endif  // OS_LINUX