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

app/gtk_util.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.
 
 #include "app/gtk_util.h"
 
 #include <gtk/gtk.h>
 
 #include "app/l10n_util.h"
+#include "base/env_var.h"
 #include "base/linux_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 
 namespace gtk_util {
 
 void GetWidgetSizeFromResources(
     GtkWidget* widget, int width_chars, int height_lines,
     int* width, int* height) {
   DCHECK(GTK_WIDGET_REALIZED(widget))
@@ skipping 29 matching lines @@
         pango_font_metrics_get_descent(metrics)) *
         height_lines / PANGO_SCALE);
   }
   pango_font_metrics_unref(metrics);
   g_object_unref(context);
 }
 
 void ApplyMessageDialogQuirks(GtkWidget* dialog) {
   if (gtk_window_get_modal(GTK_WINDOW(dialog))) {
     // Work around a KDE 3 window manager bug.
-    scoped_ptr<base::EnvironmentVariableGetter> env(
-        base::EnvironmentVariableGetter::Create());
+    scoped_ptr<base::EnvVarGetter> env(base::EnvVarGetter::Create());
     if (base::DESKTOP_ENVIRONMENT_KDE3 == GetDesktopEnvironment(env.get()))
       gtk_window_set_skip_taskbar_hint(GTK_WINDOW(dialog), FALSE);
   }
 }
 
 }  // namespace gtk_util