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

chrome/browser/shell_integration_linux.cc

-// Copyright (c) 2006-2009 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/browser/shell_integration.h"
 
 #include <fcntl.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/eintr_wrapper.h"
+#include "base/env_var.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/i18n/file_util_icu.h"
-#include "base/linux_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string_tokenizer.h"
 #include "base/task.h"
 #include "base/thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_plugin_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/browser/chrome_thread.h"
 #include "gfx/codec/png_codec.h"
 #include "googleurl/src/gurl.h"
 
 namespace {
 
-std::string GetDesktopName(base::EnvironmentVariableGetter* env_getter) {
+std::string GetDesktopName(base::EnvVarGetter* env_getter) {
 #if defined(GOOGLE_CHROME_BUILD)
   return "google-chrome.desktop";
 #else  // CHROMIUM_BUILD
   // Allow $CHROME_DESKTOP to override the built-in value, so that development
   // versions can set themselves as the default without interfering with
   // non-official, packaged versions using the built-in value.
   std::string name;
-  if (env_getter->Getenv("CHROME_DESKTOP", &name) && !name.empty())
+  if (env_getter->GetEnv("CHROME_DESKTOP", &name) && !name.empty())
     return name;
   return "chromium-browser.desktop";
 #endif
 }
 
 // Helper to launch xdg scripts. We don't want them to ask any questions on the
 // terminal etc.
 bool LaunchXdgUtility(const std::vector<std::string>& argv) {
   // xdg-settings internally runs xdg-mime, which uses mv to move newly-created
   // files on top of originals after making changes to them. In the event that
@@ skipping 128 matching lines @@
 
 }  // namespace
 
 // We delegate the difficulty of setting the default browser in Linux desktop
 // environments to a new xdg utility, xdg-settings. We have to include a copy of
 // it for this to work, obviously, but that's actually the suggested approach
 // for xdg utilities anyway.
 
 // static
 bool ShellIntegration::SetAsDefaultBrowser() {
-  scoped_ptr<base::EnvironmentVariableGetter> env_getter(
-      base::EnvironmentVariableGetter::Create());
+  scoped_ptr<base::EnvVarGetter> env_getter(base::EnvVarGetter::Create());
 
   std::vector<std::string> argv;
   argv.push_back("xdg-settings");
   argv.push_back("set");
   argv.push_back("default-web-browser");
   argv.push_back(GetDesktopName(env_getter.get()));
   return LaunchXdgUtility(argv);
 }
 
 // static
 ShellIntegration::DefaultBrowserState ShellIntegration::IsDefaultBrowser() {
-  scoped_ptr<base::EnvironmentVariableGetter> env_getter(
-      base::EnvironmentVariableGetter::Create());
+  scoped_ptr<base::EnvVarGetter> env_getter(base::EnvVarGetter::Create());
 
   std::vector<std::string> argv;
   argv.push_back("xdg-settings");
   argv.push_back("check");
   argv.push_back("default-web-browser");
   argv.push_back(GetDesktopName(env_getter.get()));
 
   std::string reply;
   if (!base::GetAppOutput(CommandLine(argv), &reply)) {
     // xdg-settings failed: we can't determine or set the default browser.
@@ skipping 12 matching lines @@
   argv.push_back("default-web-browser");
 
   std::string browser;
   // We don't care about the return value here.
   base::GetAppOutput(CommandLine(argv), &browser);
   return browser.find("irefox") != std::string::npos;
 }
 
 // static
 bool ShellIntegration::GetDesktopShortcutTemplate(
-    base::EnvironmentVariableGetter* env_getter, std::string* output) {
+    base::EnvVarGetter* env_getter, std::string* output) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
 
   std::vector<FilePath> search_paths;
 
   std::string xdg_data_home;
-  if (env_getter->Getenv("XDG_DATA_HOME", &xdg_data_home) &&
+  if (env_getter->GetEnv("XDG_DATA_HOME", &xdg_data_home) &&
       !xdg_data_home.empty()) {
     search_paths.push_back(FilePath(xdg_data_home));
   }
 
   std::string xdg_data_dirs;
-  if (env_getter->Getenv("XDG_DATA_DIRS", &xdg_data_dirs) &&
+  if (env_getter->GetEnv("XDG_DATA_DIRS", &xdg_data_dirs) &&
       !xdg_data_dirs.empty()) {
     StringTokenizer tokenizer(xdg_data_dirs, ":");
     while (tokenizer.GetNext()) {
       FilePath data_dir(tokenizer.token());
       search_paths.push_back(data_dir);
       search_paths.push_back(data_dir.Append("applications"));
     }
   }
 
   // Add some fallback paths for systems which don't have XDG_DATA_DIRS or have
@@ skipping 104 matching lines @@
   std::string contents = GetDesktopFileContents(
       shortcut_template, shortcut_info.url, shortcut_info.extension_id,
       shortcut_info.title, icon_name);
 
   if (shortcut_info.create_on_desktop)
     CreateShortcutOnDesktop(shortcut_filename, contents);
 
   if (shortcut_info.create_in_applications_menu)
     CreateShortcutInApplicationsMenu(shortcut_filename, contents);
 }