5 files changed, 9 insertions, 9 deletions
diff --git a/base/environment.cc b/base/environment.cc
index 4ff6a74..6a6b556 100644
--- a/base/environment.cc
+++ b/base/environment.cc
@@ -40,8 +40,8 @@ class EnvironmentImpl : public base::Environment {
     return GetEnvImpl(alternate_case_var.c_str(), result);
   }
 
-  virtual bool SetEnv(const char* variable_name, const std::string& new_value) {
-    return SetEnvImpl(variable_name, new_value);
+  virtual bool SetVar(const char* variable_name, const std::string& new_value) {
+    return SetVarImpl(variable_name, new_value);
   }
 
   virtual bool UnSetVar(const char* variable_name) {
@@ -75,7 +75,7 @@ class EnvironmentImpl : public base::Environment {
 #endif
   }
 
-  bool SetEnvImpl(const char* variable_name, const std::string& new_value) {
+  bool SetVarImpl(const char* variable_name, const std::string& new_value) {
 #if defined(OS_POSIX)
     // On success, zero is returned.
     return setenv(variable_name, new_value.c_str(), 1) == 0;
diff --git a/base/environment.h b/base/environment.h
index 4e2a6e7..ac83de3 100644
--- a/base/environment.h
+++ b/base/environment.h
@@ -36,7 +36,7 @@ class Environment {
   virtual bool HasVar(const char* variable_name);
 
   // Returns true on success, otherwise returns false.
-  virtual bool SetEnv(const char* variable_name,
+  virtual bool SetVar(const char* variable_name,
                       const std::string& new_value) = 0;
 
   // Returns true on success, otherwise returns false.
diff --git a/base/environment_unittest.cc b/base/environment_unittest.cc
index 302a0d0..ba48123 100644
--- a/base/environment_unittest.cc
+++ b/base/environment_unittest.cc
@@ -23,12 +23,12 @@ TEST_F(EnvironmentTest, HasVar) {
   EXPECT_TRUE(env->HasVar("PATH"));
 }
 
-TEST_F(EnvironmentTest, SetEnvVar) {
+TEST_F(EnvironmentTest, SetVar) {
   scoped_ptr<base::Environment> env(base::Environment::Create());
 
   const char kFooUpper[] = "FOO";
   const char kFooLower[] = "foo";
-  EXPECT_TRUE(env->SetEnv(kFooUpper, kFooLower));
+  EXPECT_TRUE(env->SetVar(kFooUpper, kFooLower));
 
   // Now verify that the environment has the new variable.
   EXPECT_TRUE(env->HasVar(kFooUpper));
@@ -44,7 +44,7 @@ TEST_F(EnvironmentTest, UnSetVar) {
   const char kFooUpper[] = "FOO";
   const char kFooLower[] = "foo";
   // First set some environment variable.
-  EXPECT_TRUE(env->SetEnv(kFooUpper, kFooLower));
+  EXPECT_TRUE(env->SetVar(kFooUpper, kFooLower));
 
   // Now verify that the environment has the new variable.
   EXPECT_TRUE(env->HasVar(kFooUpper));
diff --git a/base/nss_util.cc b/base/nss_util.cc
index ac6752e..cd44fed 100644
--- a/base/nss_util.cc
+++ b/base/nss_util.cc
@@ -83,7 +83,7 @@ void UseLocalCacheOfNSSDatabaseIfNFS(const FilePath& database_dir) {
       scoped_ptr<base::Environment> env(base::Environment::Create());
       const char* use_cache_env_var = "NSS_SDB_USE_CACHE";
       if (!env->HasVar(use_cache_env_var))
-        env->SetEnv(use_cache_env_var, "yes");
+        env->SetVar(use_cache_env_var, "yes");
     }
   }
 #endif  // defined(OS_LINUX)
diff --git a/base/xdg_util_unittest.cc b/base/xdg_util_unittest.cc
index 01e566c..09f65c4 100644
--- a/base/xdg_util_unittest.cc
+++ b/base/xdg_util_unittest.cc
@@ -18,7 +18,7 @@ namespace {
 class MockEnvironment : public base::Environment {
  public:
   MOCK_METHOD2(GetEnv, bool(const char*, std::string* result));
-  MOCK_METHOD2(SetEnv, bool(const char*, const std::string& new_value));
+  MOCK_METHOD2(SetVar, bool(const char*, const std::string& new_value));
   MOCK_METHOD1(UnSetVar, bool(const char*));
 };