base: Rename EnvVarGetter to Environment.

base/xdg_util.cc

Index: base/xdg_util.cc
diff --git a/base/xdg_util.cc b/base/xdg_util.cc
index 0ff6c470927ce153fd055ce6863fa2f4e630e51a..426ef0e8d2fb10215425325170236cc1af1cef56 100644
--- a/base/xdg_util.cc
+++ b/base/xdg_util.cc
@@ -4,14 +4,14 @@
 
 #include "base/xdg_util.h"
 
-#include "base/env_var.h"
+#include "base/environment.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/third_party/xdg_user_dirs/xdg_user_dir_lookup.h"
 
 namespace base {
 
-FilePath GetXDGDirectory(EnvVarGetter* env, const char* env_name,
+FilePath GetXDGDirectory(Environment* env, const char* env_name,
                          const char* fallback_dir) {
   std::string env_value;
   if (env->GetEnv(env_name, &env_value) && !env_value.empty())
@@ -19,7 +19,7 @@ FilePath GetXDGDirectory(EnvVarGetter* env, const char* env_name,
   return file_util::GetHomeDir().Append(fallback_dir);
 }
 
-FilePath GetXDGUserDirectory(EnvVarGetter* env, const char* dir_name,
+FilePath GetXDGUserDirectory(Environment* env, const char* dir_name,
                              const char* fallback_dir) {
   char* xdg_dir = xdg_user_dir_lookup(dir_name);
   if (xdg_dir) {
@@ -30,7 +30,7 @@ FilePath GetXDGUserDirectory(EnvVarGetter* env, const char* dir_name,
   return file_util::GetHomeDir().Append(fallback_dir);
 }
 
-DesktopEnvironment GetDesktopEnvironment(EnvVarGetter* env) {
+DesktopEnvironment GetDesktopEnvironment(Environment* env) {
   std::string desktop_session;
   if (env->GetEnv("DESKTOP_SESSION", &desktop_session)) {
     if (desktop_session == "gnome") {
@@ -76,7 +76,7 @@ const char* GetDesktopEnvironmentName(DesktopEnvironment env) {
   return NULL;
 }
 
-const char* GetDesktopEnvironmentName(EnvVarGetter* env) {
+const char* GetDesktopEnvironmentName(Environment* env) {
   return GetDesktopEnvironmentName(GetDesktopEnvironment(env));
 }