5 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/locale_tests_uitest.cc b/chrome/browser/locale_tests_uitest.cc
index b8f5e32..85a9510 100644
--- a/chrome/browser/locale_tests_uitest.cc
+++ b/chrome/browser/locale_tests_uitest.cc
@@ -17,7 +17,7 @@ class LocaleTestsBase : public UITest {
 #if defined(OS_LINUX)
     scoped_ptr<base::Environment> env(base::Environment::Create());
     if (old_lc_all_) {
-      env->SetEnv("LC_ALL", old_lc_all_);
+      env->SetVar("LC_ALL", old_lc_all_);
     } else {
       env->UnSetVar("LC_ALL");
     }
diff --git a/chrome/browser/shell_integration_unittest.cc b/chrome/browser/shell_integration_unittest.cc
index 4353911..28f02c6 100644
--- a/chrome/browser/shell_integration_unittest.cc
+++ b/chrome/browser/shell_integration_unittest.cc
@@ -48,7 +48,7 @@ class MockEnvironment : public base::Environment {
     return false;
   }
 
-  virtual bool SetEnv(const char* variable_name, const std::string& new_value) {
+  virtual bool SetVar(const char* variable_name, const std::string& new_value) {
     ADD_FAILURE();
     return false;
   }
diff --git a/chrome/browser/zygote_host_linux.cc b/chrome/browser/zygote_host_linux.cc
index be0ce5a..0d57b55 100644
--- a/chrome/browser/zygote_host_linux.cc
+++ b/chrome/browser/zygote_host_linux.cc
@@ -44,7 +44,7 @@ static void SaveSUIDUnsafeEnvironmentVariables() {
     scoped_ptr<base::Environment> env(base::Environment::Create());
     std::string value;
     if (env->GetEnv(envvar, &value))
-      env->SetEnv(saved_envvar, value);
+      env->SetVar(saved_envvar, value);
     else
       env->UnSetVar(saved_envvar);
 
diff --git a/chrome/common/logging_chrome_uitest.cc b/chrome/common/logging_chrome_uitest.cc
index 2a2e89b..a8c39c0 100644
--- a/chrome/common/logging_chrome_uitest.cc
+++ b/chrome/common/logging_chrome_uitest.cc
@@ -29,14 +29,14 @@ class ChromeLoggingTest : public testing::Test {
     if (!env->GetEnv(env_vars::kLogFileName, &environment_filename_))
       environment_filename_ = "";
 
-    env->SetEnv(env_vars::kLogFileName, new_value);
+    env->SetVar(env_vars::kLogFileName, new_value);
   }
 
   // Restores the value of the log file nave environment variable
   // previously saved by SaveEnvironmentVariable().
   void RestoreEnvironmentVariable() {
     scoped_ptr<base::Environment> env(base::Environment::Create());
-    env->SetEnv(env_vars::kLogFileName, environment_filename_);
+    env->SetVar(env_vars::kLogFileName, environment_filename_);
   }
 
  private:
diff --git a/chrome/plugin/plugin_main_mac.mm b/chrome/plugin/plugin_main_mac.mm
index cc5b67e..46f9183 100644
--- a/chrome/plugin/plugin_main_mac.mm
+++ b/chrome/plugin/plugin_main_mac.mm
@@ -36,7 +36,7 @@ void TrimInterposeEnvironment() {
              strcmp(interpose_list.c_str() + suffix_offset,
                     plugin_interpose_strings::kInterposeLibraryPath) == 0) {
     std::string trimmed_list = interpose_list.substr(0, suffix_offset - 1);
-    env->SetEnv(plugin_interpose_strings::kDYLDInsertLibrariesKey,
+    env->SetVar(plugin_interpose_strings::kDYLDInsertLibrariesKey,
                 trimmed_list.c_str());
   } else {
     NOTREACHED() << "Missing Carbon interposing library";