Cleanup in base/test.

base/test/scoped_locale.h

 // 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.
 
 #ifndef BASE_TEST_TEST_UTIL_H_

[Paweł Hajdan Jr., 2011/06/10 17:00:51]

nit: The #include guards should be updated.

Also, please keep the file name in sync with the class name. I'd suggest
changing the class name to ScopedLocale.

[Joao da Silva, 2011/06/14 16:48:44]

Done.

 #define BASE_TEST_TEST_UTIL_H_
 #pragma once
 
-// Generic utilities used only by tests.
-
-#include <locale.h>
-
 #include <string>
 
+#include "base/basictypes.h"
+
 namespace base {
 
-#if defined(OS_POSIX)
-
 // Sets the given |locale| on construction, and restores the previous locale
 // on destruction.
 class ScopedSetLocale {
  public:
-  explicit ScopedSetLocale(const char* locale) {
-    old_locale_ = setlocale(LC_ALL, NULL);
-    setlocale(LC_ALL, locale);
-  }
-  ~ScopedSetLocale() {
-    setlocale(LC_ALL, old_locale_.c_str());
+  explicit ScopedSetLocale(const std::string& locale);

[Joao da Silva, 2011/06/10 15:53:56]

Done. I didn't use a StringPiece because is stores a ptr to string.data() and
its size, but setlocale() expects a nul-terminated string.

+  ~ScopedSetLocale();
+
+  // Returns the locale that was set by the ctor.
+  // Can be NULL, if the locale requested isn't available.
+  const char* current_locale() const {
+    return current_locale_;
   }
 
  private:
-  std::string old_locale_;
+  const char* prev_locale_;
+  const char* current_locale_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedSetLocale);
 };
 
-#endif
-
 }  // namespace base
 
 #endif  // BASE_TEST_TEST_UTIL_H_