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

10 files changed, 15 insertions, 13 deletions

diff --git a/app/l10n_util_unittest.cc b/app/l10n_util_unittest.cc
index 2341559..0625154 100644
--- a/app/l10n_util_unittest.cc
+++ b/app/l10n_util_unittest.cc
@@ -165,7 +165,7 @@ TEST_F(L10nUtilTest, GetAppLocale) {
 
   // Make sure the follow tests won't be affected by LANGUAGE environment
   // variable.
-  env->UnSetEnv("LANGUAGE");
+  env->UnSetVar("LANGUAGE");
 #endif  // defined(OS_POSIX) && !defined(OS_CHROMEOS)
 
   SetICUDefaultLocale("en-US");
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";
diff --git a/chrome/browser/locale_tests_uitest.cc b/chrome/browser/locale_tests_uitest.cc
index 94cefdb..b8f5e32 100644
--- a/chrome/browser/locale_tests_uitest.cc
+++ b/chrome/browser/locale_tests_uitest.cc
@@ -19,7 +19,7 @@ class LocaleTestsBase : public UITest {
     if (old_lc_all_) {
       env->SetEnv("LC_ALL", old_lc_all_);
     } else {
-      env->UnSetEnv("LC_ALL");
+      env->UnSetVar("LC_ALL");
     }
 #endif
   };
diff --git a/chrome/browser/shell_integration_unittest.cc b/chrome/browser/shell_integration_unittest.cc
index cc3372c..4353911 100644
--- a/chrome/browser/shell_integration_unittest.cc
+++ b/chrome/browser/shell_integration_unittest.cc
@@ -53,7 +53,7 @@ class MockEnvironment : public base::Environment {
     return false;
   }
 
-  virtual bool UnSetEnv(const char* variable_name) {
+  virtual bool UnSetVar(const char* variable_name) {
     ADD_FAILURE();
     return false;
   }
diff --git a/chrome/browser/zygote_host_linux.cc b/chrome/browser/zygote_host_linux.cc
index 2828e3e..cc91bd2 100644
--- a/chrome/browser/zygote_host_linux.cc
+++ b/chrome/browser/zygote_host_linux.cc
@@ -46,7 +46,7 @@ static void SaveSUIDUnsafeEnvironmentVariables() {
     if (env->GetEnv(envvar, &value))
       env->SetEnv(saved_envvar, value);
     else
-      env->UnSetEnv(saved_envvar);
+      env->UnSetVar(saved_envvar);
 
     free(saved_envvar);
   }
diff --git a/chrome/plugin/plugin_main_mac.mm b/chrome/plugin/plugin_main_mac.mm
index 7c7c879..cc5b67e 100644
--- a/chrome/plugin/plugin_main_mac.mm
+++ b/chrome/plugin/plugin_main_mac.mm
@@ -31,7 +31,7 @@ void TrimInterposeEnvironment() {
   if (suffix_offset == 0 &&
       strcmp(interpose_list.c_str(),
              plugin_interpose_strings::kInterposeLibraryPath) == 0) {
-    env->UnSetEnv(plugin_interpose_strings::kDYLDInsertLibrariesKey);
+    env->UnSetVar(plugin_interpose_strings::kDYLDInsertLibrariesKey);
   } else if (suffix_offset > 0 && interpose_list[suffix_offset - 1] == ':' &&
              strcmp(interpose_list.c_str() + suffix_offset,
                     plugin_interpose_strings::kInterposeLibraryPath) == 0) {
diff --git a/net/proxy/proxy_config_service_linux_unittest.cc b/net/proxy/proxy_config_service_linux_unittest.cc
index 5a8f292..6be44fe 100644
--- a/net/proxy/proxy_config_service_linux_unittest.cc
+++ b/net/proxy/proxy_config_service_linux_unittest.cc
@@ -104,6 +104,7 @@ class MockEnvironment : public base::Environment {
     values = zero_values;
   }
 
+  // Begin base::Environment implementation.
   virtual bool GetEnv(const char* variable_name, std::string* result) {
     const char* env_value = table.Get(variable_name);
     if (env_value) {
@@ -119,10 +120,11 @@ class MockEnvironment : public base::Environment {
     return false;
   }
 
-  virtual bool UnSetEnv(const char* variable_name) {
+  virtual bool UnSetVar(const char* variable_name) {
     ADD_FAILURE();
     return false;
   }
+  // End base::Environment implementation.
 
   // Intentionally public, for convenience when setting up a test.
   EnvVarValues values;