Reland r54418 - base: Add UnSetEnv function to EnvVarGetter API.

chrome/browser/locale_tests_uitest.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 "chrome/test/ui/ui_test.h"
 
+#include "base/env_var.h"
 #include "build/build_config.h"
 
 class LocaleTestsBase : public UITest {
  public:
   LocaleTestsBase() : UITest(), old_lc_all_(NULL) {
   }
 
  protected:
   void RestoreLcAllEnvironment() {
 #if defined(OS_LINUX)
+    scoped_ptr<base::EnvVarGetter> env(base::EnvVarGetter::Create());
     if (old_lc_all_) {
-      setenv("LC_ALL", old_lc_all_, 1);
+      env->SetEnv("LC_ALL", old_lc_all_);
     } else {
-      unsetenv("LC_ALL");
+      env->UnSetEnv("LC_ALL");
     }
 #endif
   };
 
   const char* old_lc_all_;
 };
 
 
 class LocaleTestsDa : public LocaleTestsBase {
  public:
@@ skipping 38 matching lines @@
 
 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();
 }