base: rename Environment::HasEnv to Environment::HasVar.

This is the part 2 of this series. More two 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/3035050

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

5 files changed, 12 insertions, 12 deletions

diff --git a/base/environment.cc b/base/environment.cc
index 1ec890d..4ff6a74 100644
--- a/base/environment.cc
+++ b/base/environment.cc
@@ -119,7 +119,7 @@ Environment* Environment::Create() {
   return new EnvironmentImpl();
 }
 
-bool Environment::HasEnv(const char* variable_name) {
+bool Environment::HasVar(const char* variable_name) {
   return GetEnv(variable_name, NULL);
 }
 
diff --git a/base/environment.h b/base/environment.h
index fa8f197..4e2a6e7 100644
--- a/base/environment.h
+++ b/base/environment.h
@@ -33,7 +33,7 @@ class Environment {
   virtual bool GetEnv(const char* variable_name, std::string* result) = 0;
 
   // Syntactic sugar for GetEnv(variable_name, NULL);
-  virtual bool HasEnv(const char* variable_name);
+  virtual bool HasVar(const char* variable_name);
 
   // Returns true on success, otherwise returns false.
   virtual bool SetEnv(const char* variable_name,
diff --git a/base/environment_unittest.cc b/base/environment_unittest.cc
index f37b682..302a0d0 100644
--- a/base/environment_unittest.cc
+++ b/base/environment_unittest.cc
@@ -17,10 +17,10 @@ TEST_F(EnvironmentTest, GetEnvVar) {
   EXPECT_NE(env_value, "");
 }
 
-TEST_F(EnvironmentTest, HasEnvVar) {
+TEST_F(EnvironmentTest, HasVar) {
   // Every setup should have PATH...
   scoped_ptr<base::Environment> env(base::Environment::Create());
-  EXPECT_TRUE(env->HasEnv("PATH"));
+  EXPECT_TRUE(env->HasVar("PATH"));
 }
 
 TEST_F(EnvironmentTest, SetEnvVar) {
@@ -31,7 +31,7 @@ TEST_F(EnvironmentTest, SetEnvVar) {
   EXPECT_TRUE(env->SetEnv(kFooUpper, kFooLower));
 
   // Now verify that the environment has the new variable.
-  EXPECT_TRUE(env->HasEnv(kFooUpper));
+  EXPECT_TRUE(env->HasVar(kFooUpper));
 
   std::string var_value;
   EXPECT_TRUE(env->GetEnv(kFooUpper, &var_value));
@@ -47,11 +47,11 @@ TEST_F(EnvironmentTest, UnSetVar) {
   EXPECT_TRUE(env->SetEnv(kFooUpper, kFooLower));
 
   // Now verify that the environment has the new variable.
-  EXPECT_TRUE(env->HasEnv(kFooUpper));
+  EXPECT_TRUE(env->HasVar(kFooUpper));
 
   // Finally verify that the environment variable was erased.
   EXPECT_TRUE(env->UnSetVar(kFooUpper));
 
   // And check that the variable has been unset.
-  EXPECT_FALSE(env->HasEnv(kFooUpper));
+  EXPECT_FALSE(env->HasVar(kFooUpper));
 }
diff --git a/base/nss_util.cc b/base/nss_util.cc
index 0d7ec07..ac6752e 100644
--- a/base/nss_util.cc
+++ b/base/nss_util.cc
@@ -82,7 +82,7 @@ void UseLocalCacheOfNSSDatabaseIfNFS(const FilePath& database_dir) {
     if (buf.f_type == NFS_SUPER_MAGIC) {
       scoped_ptr<base::Environment> env(base::Environment::Create());
       const char* use_cache_env_var = "NSS_SDB_USE_CACHE";
-      if (!env->HasEnv(use_cache_env_var))
+      if (!env->HasVar(use_cache_env_var))
         env->SetEnv(use_cache_env_var, "yes");
     }
   }
diff --git a/base/xdg_util.cc b/base/xdg_util.cc
index 426ef0e..6978986 100644
--- a/base/xdg_util.cc
+++ b/base/xdg_util.cc
@@ -39,7 +39,7 @@ DesktopEnvironment GetDesktopEnvironment(Environment* env) {
       return DESKTOP_ENVIRONMENT_KDE4;
     } else if (desktop_session == "kde") {
       // This may mean KDE4 on newer systems, so we have to check.
-      if (env->HasEnv("KDE_SESSION_VERSION"))
+      if (env->HasVar("KDE_SESSION_VERSION"))
         return DESKTOP_ENVIRONMENT_KDE4;
       return DESKTOP_ENVIRONMENT_KDE3;
     } else if (desktop_session.find("xfce") != std::string::npos) {
@@ -49,10 +49,10 @@ DesktopEnvironment GetDesktopEnvironment(Environment* env) {
 
   // Fall back on some older environment variables.
   // Useful particularly in the DESKTOP_SESSION=default case.
-  if (env->HasEnv("GNOME_DESKTOP_SESSION_ID")) {
+  if (env->HasVar("GNOME_DESKTOP_SESSION_ID")) {
     return DESKTOP_ENVIRONMENT_GNOME;
-  } else if (env->HasEnv("KDE_FULL_SESSION")) {
-    if (env->HasEnv("KDE_SESSION_VERSION"))
+  } else if (env->HasVar("KDE_FULL_SESSION")) {
+    if (env->HasVar("KDE_SESSION_VERSION"))
       return DESKTOP_ENVIRONMENT_KDE4;
     return DESKTOP_ENVIRONMENT_KDE3;
   }