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

chrome/common/chrome_paths_linux.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.
 
 #include "chrome/common/chrome_paths_internal.h"
 
+#include "base/env_var.h"
 #include "base/linux_util.h"
 #include "base/scoped_ptr.h"
 
 namespace chrome {
 
 // See http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
 // for a spec on where config files go.  The net effect for most
 // systems is we use ~/.config/chromium/ for Chromium and
 // ~/.config/google-chrome/ for official builds.
 // (This also helps us sidestep issues with other apps grabbing ~/.chromium .)
 bool GetDefaultUserDataDirectory(FilePath* result) {
-  scoped_ptr<base::EnvironmentVariableGetter> env(
-      base::EnvironmentVariableGetter::Create());
+  scoped_ptr<base::EnvVarGetter> env(base::EnvVarGetter::Create());
   FilePath config_dir(
       base::GetXDGDirectory(env.get(), "XDG_CONFIG_HOME", ".config"));
 #if defined(GOOGLE_CHROME_BUILD)
   *result = config_dir.Append("google-chrome");
 #else
   *result = config_dir.Append("chromium");
 #endif
   return true;
 }
 
 bool GetChromeFrameUserDataDirectory(FilePath* result) {
-  scoped_ptr<base::EnvironmentVariableGetter> env(
-      base::EnvironmentVariableGetter::Create());
+  scoped_ptr<base::EnvVarGetter> env(base::EnvVarGetter::Create());
   FilePath config_dir(
       base::GetXDGDirectory(env.get(), "XDG_CONFIG_HOME", ".config"));
 #if defined(GOOGLE_CHROME_BUILD)
   *result = config_dir.Append("google-chrome-frame");
 #else
   *result = config_dir.Append("chrome-frame");
 #endif
   return true;
 }
 
 bool GetUserDocumentsDirectory(FilePath* result) {
-  scoped_ptr<base::EnvironmentVariableGetter> env(
-      base::EnvironmentVariableGetter::Create());
+  scoped_ptr<base::EnvVarGetter> env(base::EnvVarGetter::Create());
   *result = base::GetXDGUserDirectory(env.get(), "DOCUMENTS", "Documents");
   return true;
 }
 
 // We respect the user's preferred download location, unless it is
 // ~ or their desktop directory, in which case we default to ~/Downloads.
 bool GetUserDownloadsDirectory(FilePath* result) {
-  scoped_ptr<base::EnvironmentVariableGetter> env(
-      base::EnvironmentVariableGetter::Create());
+  scoped_ptr<base::EnvVarGetter> env(base::EnvVarGetter::Create());
   *result = base::GetXDGUserDirectory(env.get(), "DOWNLOAD", "Downloads");
 
   FilePath home = base::GetHomeDir(env.get());
   if (*result == home) {
     *result = home.Append("Downloads");
     return true;
   }
 
   FilePath desktop;
   GetUserDesktop(&desktop);
   if (*result == desktop) {
     *result = home.Append("Downloads");
   }
 
   return true;
 }
 
 bool GetUserDesktop(FilePath* result) {
-  scoped_ptr<base::EnvironmentVariableGetter> env(
-      base::EnvironmentVariableGetter::Create());
+  scoped_ptr<base::EnvVarGetter> env(base::EnvVarGetter::Create());
   *result = base::GetXDGUserDirectory(env.get(), "DESKTOP", "Desktop");
   return true;
 }
 
 }  // namespace chrome