base: Rename EnvVarGetter to Environment.

chrome/browser/dom_ui/advanced_options_utils_gtk.cc

 // 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.
 
 #if !defined(OS_CHROMEOS)
 
 #include "chrome/browser/dom_ui/advanced_options_utils.h"
 
 #include "app/gtk_signal.h"
 #include "app/gtk_util.h"
 #include "base/file_util.h"
-#include "base/env_var.h"
+#include "base/environment.h"
 #include "base/process_util.h"
 #include "base/string_tokenizer.h"
 #include "base/xdg_util.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/process_watcher.h"
 
 // Command used to configure GNOME proxy settings. The command was renamed
 // in January 2009, so both are used to work on both old and new systems.
 const char* kOldGNOMEProxyConfigCommand[] = {"gnome-network-preferences", NULL};
@@ skipping 51 matching lines @@
     BrowserList::GetLastActive()->
         OpenURL(GURL(kLinuxProxyConfigUrl), GURL(), NEW_FOREGROUND_TAB,
                 PageTransition::LINK);
     return;
   }
   ProcessWatcher::EnsureProcessGetsReaped(handle);
 }
 
 void AdvancedOptionsUtilities::ShowNetworkProxySettings(
       TabContents* tab_contents) {
-  scoped_ptr<base::EnvVarGetter> env_getter(base::EnvVarGetter::Create());
+  scoped_ptr<base::Environment> env(base::Environment::Create());
 
   ProxyConfigCommand command;
   bool found_command = false;
-  switch (base::GetDesktopEnvironment(env_getter.get())) {
+  switch (base::GetDesktopEnvironment(env.get())) {
     case base::DESKTOP_ENVIRONMENT_GNOME: {
       size_t index;
       ProxyConfigCommand commands[2];
       commands[0].argv = kGNOMEProxyConfigCommand;
       commands[1].argv = kOldGNOMEProxyConfigCommand;
       found_command = SearchPATH(commands, 2, &index);
       if (found_command)
         command = commands[index];
       break;
     }
 
     case base::DESKTOP_ENVIRONMENT_KDE3:
       command.argv = kKDE3ProxyConfigCommand;
       found_command = SearchPATH(&command, 1, NULL);
       break;
 
     case base::DESKTOP_ENVIRONMENT_KDE4:
       command.argv = kKDE4ProxyConfigCommand;
       found_command = SearchPATH(&command, 1, NULL);
       break;
 
     case base::DESKTOP_ENVIRONMENT_XFCE:
     case base::DESKTOP_ENVIRONMENT_OTHER:
       break;
   }
 
   if (found_command) {
     StartProxyConfigUtil(command);
   } else {
-    const char* name = base::GetDesktopEnvironmentName(env_getter.get());
+    const char* name = base::GetDesktopEnvironmentName(env.get());
     if (name)
       LOG(ERROR) << "Could not find " << name << " network settings in $PATH";
     tab_contents->OpenURL(GURL(kLinuxProxyConfigUrl), GURL(),
                           NEW_FOREGROUND_TAB, PageTransition::LINK);
   }
 }
 
 void AdvancedOptionsUtilities::ShowManageSSLCertificates(
       TabContents* tab_contents) {
   tab_contents->OpenURL(GURL(kLinuxCertificatesConfigUrl), GURL(),
                         NEW_WINDOW, PageTransition::LINK);
 }
 
 #endif  // !defined(OS_CHROMEOS)