Move EnvironmentVariableGetter from base/linux_util.h to base/env_var.h. Labe...

base/base_paths_posix.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This is really Posix minus Mac. Mac code is in base_paths_mac.mm.
 
 #include "base/base_paths.h"
 
 #include <unistd.h>
 
+#include "base/env_var.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/linux_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "base/sys_string_conversions.h"
 
 namespace base {
 
@@ skipping 34 matching lines @@
       // drive) try assuming the current directory is the source root.
       if (file_util::GetCurrentDirectory(&path) &&
           file_util::PathExists(path.Append("base/base_paths_posix.cc"))) {
         *result = path;
         return true;
       }
       LOG(ERROR) << "Couldn't find your source root.  "
                  << "Try running from your chromium/src directory.";
       return false;
     case base::DIR_USER_CACHE:
-      scoped_ptr<base::EnvironmentVariableGetter> env(
-          base::EnvironmentVariableGetter::Create());
+      scoped_ptr<base::EnvVarGetter> env(base::EnvVarGetter::Create());
       FilePath cache_dir(base::GetXDGDirectory(env.get(), "XDG_CACHE_HOME",
                                                ".cache"));
       *result = cache_dir;
       return true;
   }
   return false;
 }
 
 }  // namespace base