Use Environment::SetVar in more places.

chrome/test/tab_switching/tab_switching_test.cc

 // 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 "base/command_line.h"
+#include "base/environment.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/platform_thread.h"
+#include "base/scoped_ptr.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/ui/ui_test.h"
@@ skipping 17 matching lines @@
     path_prefix_ = path_prefix_.AppendASCII("tab_switching");
 
     show_window_ = true;
   }
 
   void SetUp() {
     // Set the log_file_name_ path according to the selected browser_directory_.
     log_file_name_ = browser_directory_.AppendASCII("chrome_debug.log");
 
     // Set the log file path for the browser test.
+    scoped_ptr<base::Environment> env(base::Environment::Create());
 #if defined(OS_WIN)
-    SetEnvironmentVariable(UTF8ToWide(env_vars::kLogFileName).c_str(),
-                           log_file_name_.value().c_str());
+    env->SetVar(env_vars::kLogFileName, WideToUTF8(log_file_name_.value()));
 #else
-    setenv(env_vars::kLogFileName,
-           log_file_name_.value().c_str(), 1);
+    env->SetVar(env_vars::kLogFileName, log_file_name_.value());
 #endif
 
     // Add the necessary arguments to Chrome's launch command for these tests.
     AddLaunchArguments();
 
     // Run the rest of the UITest initialization.
     UITest::SetUp();
   }
 
   static const int kNumCycles = 5;
@@ skipping 121 matching lines @@
 TEST_F(TabSwitchingUITest, TabSwitch) {
   RunTabSwitchingUITest("t", true);
 }
 
 TEST_F(TabSwitchingUITest, TabSwitchRef) {
   UseReferenceBuild();
   RunTabSwitchingUITest("t_ref", true);
 }
 
 }  // namespace