summaryrefslogtreecommitdiffstats
path: root/chrome/browser/locale_tests_uitest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/locale_tests_uitest.cc')
-rw-r--r--chrome/browser/locale_tests_uitest.cc10
1 files changed, 4 insertions, 6 deletions
diff --git a/chrome/browser/locale_tests_uitest.cc b/chrome/browser/locale_tests_uitest.cc
index 85a9510..ea171a8 100644
--- a/chrome/browser/locale_tests_uitest.cc
+++ b/chrome/browser/locale_tests_uitest.cc
@@ -12,8 +12,7 @@ class LocaleTestsBase : public UITest {
LocaleTestsBase() : UITest(), old_lc_all_(NULL) {
}
- protected:
- void RestoreLcAllEnvironment() {
+ virtual void TearDown() {
#if defined(OS_LINUX)
scoped_ptr<base::Environment> env(base::Environment::Create());
if (old_lc_all_) {
@@ -22,8 +21,10 @@ class LocaleTestsBase : public UITest {
env->UnSetVar("LC_ALL");
}
#endif
- };
+ UITest::TearDown();
+ }
+ protected:
const char* old_lc_all_;
};
@@ -66,15 +67,12 @@ class LocaleTestsZhTw : public LocaleTestsBase {
TEST_F(LocaleTestsDa, TestStart) {
// Just making sure we can start/shutdown cleanly.
- RestoreLcAllEnvironment();
}
TEST_F(LocaleTestsHe, TestStart) {
// Just making sure we can start/shutdown cleanly.
- RestoreLcAllEnvironment();
}
TEST_F(LocaleTestsZhTw, TestStart) {
// Just making sure we can start/shutdown cleanly.
- RestoreLcAllEnvironment();
}