base: rename Environment::UnSetEnv to Environment::UnSetVar.

This is the part 1 of this series. More three comming. Splitting this
into small parts, so it is more easy to review and reduce the size of the CL.

BUG=None
TEST=trybots

Review URL: http://codereview.chromium.org/3058034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54862 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 7 insertions, 7 deletions

diff --git a/base/environment.cc b/base/environment.cc
index 2ebdd43..1ec890d 100644
--- a/base/environment.cc
+++ b/base/environment.cc
@@ -44,8 +44,8 @@ class EnvironmentImpl : public base::Environment {
     return SetEnvImpl(variable_name, new_value);
   }
 
-  virtual bool UnSetEnv(const char* variable_name) {
-    return UnSetEnvImpl(variable_name);
+  virtual bool UnSetVar(const char* variable_name) {
+    return UnSetVarImpl(variable_name);
   }
 
  private:
@@ -86,7 +86,7 @@ class EnvironmentImpl : public base::Environment {
 #endif
   }
 
-  bool UnSetEnvImpl(const char* variable_name) {
+  bool UnSetVarImpl(const char* variable_name) {
 #if defined(OS_POSIX)
     // On success, zero is returned.
     return unsetenv(variable_name) == 0;
diff --git a/base/environment.h b/base/environment.h
index a586ae8..fa8f197 100644
--- a/base/environment.h
+++ b/base/environment.h
@@ -40,7 +40,7 @@ class Environment {
                       const std::string& new_value) = 0;
 
   // Returns true on success, otherwise returns false.
-  virtual bool UnSetEnv(const char* variable_name) = 0;
+  virtual bool UnSetVar(const char* variable_name) = 0;
 };
 
 }  // namespace base
diff --git a/base/environment_unittest.cc b/base/environment_unittest.cc
index 5b4ddc3..f37b682 100644
--- a/base/environment_unittest.cc
+++ b/base/environment_unittest.cc
@@ -38,7 +38,7 @@ TEST_F(EnvironmentTest, SetEnvVar) {
   EXPECT_EQ(var_value, kFooLower);
 }
 
-TEST_F(EnvironmentTest, UnSetEnvVar) {
+TEST_F(EnvironmentTest, UnSetVar) {
   scoped_ptr<base::Environment> env(base::Environment::Create());
 
   const char kFooUpper[] = "FOO";
@@ -50,7 +50,7 @@ TEST_F(EnvironmentTest, UnSetEnvVar) {
   EXPECT_TRUE(env->HasEnv(kFooUpper));
 
   // Finally verify that the environment variable was erased.
-  EXPECT_TRUE(env->UnSetEnv(kFooUpper));
+  EXPECT_TRUE(env->UnSetVar(kFooUpper));
 
   // And check that the variable has been unset.
   EXPECT_FALSE(env->HasEnv(kFooUpper));
diff --git a/base/xdg_util_unittest.cc b/base/xdg_util_unittest.cc
index c876466..01e566c 100644
--- a/base/xdg_util_unittest.cc
+++ b/base/xdg_util_unittest.cc
@@ -19,7 +19,7 @@ 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_METHOD1(UnSetEnv, bool(const char*));
+  MOCK_METHOD1(UnSetVar, bool(const char*));
 };
 
 const char* kGnome = "gnome";