Restore locales after tests

base/test/icu_test_util.cc

Index: base/test/icu_test_util.cc
diff --git a/base/test/icu_test_util.cc b/base/test/icu_test_util.cc
new file mode 100644
index 0000000000000000000000000000000000000000..fe486462e02e20e8e7c3149bbd4e998e40bf6c22
--- /dev/null
+++ b/base/test/icu_test_util.cc
@@ -0,0 +1,18 @@
+// Copyright 2015 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 "base/i18n/rtl.h"

[Mark Mentovai, 2015/08/19 13:37:15]

#include icu_test_util.h first, because it’s associated with this file. Then,
leave a blank line and have the other two #includes.

+#include "base/test/icu_test_util.h"
+#include "third_party/icu/source/common/unicode/uloc.h"
+
+namespace base {
+
+ScopedSetICUDefaultLocale::ScopedSetICUDefaultLocale() {
+  default_locale_ = uloc_getDefault();

[Mark Mentovai, 2015/08/19 13:37:15]

Use initializer format instead for constructors when possible:

ScopedSetICUDefaultLocale::ScopedSetICUDefaultLocale()
    : default_locale_(uloc_getDefault()) {
}

+}
+
+ScopedSetICUDefaultLocale::~ScopedSetICUDefaultLocale() {
+  i18n::SetICUDefaultLocale(default_locale_.data());
+}
+}  // namespace base

[Mark Mentovai, 2015/08/19 13:37:15]

Blank line before this.