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

chrome/browser/gtk/gtk_theme_provider.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 "chrome/browser/gtk/gtk_theme_provider.h"
 
 #include <gtk/gtk.h>
 
+#include <set>
+
 #include "app/resource_bundle.h"
+#include "base/env_var.h"
 #include "base/linux_util.h"
 #include "base/stl_util-inl.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/gtk/cairo_cached_surface.h"
 #include "chrome/browser/gtk/hover_controller_gtk.h"
 #include "chrome/browser/gtk/gtk_chrome_button.h"
 #include "chrome/browser/gtk/meta_frames.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/common/pref_names.h"
@@ skipping 373 matching lines @@
                                  GTK_ICON_SIZE_MENU, NULL);
     }
     if (default_bookmark_icon_)
       return default_bookmark_icon_;
   }
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   static GdkPixbuf* default_bookmark_icon_ = rb.GetPixbufNamed(
       IDR_DEFAULT_FAVICON);
   return default_bookmark_icon_;
-
 }
 
 // static
 bool GtkThemeProvider::DefaultUsesSystemTheme() {
-  scoped_ptr<base::EnvironmentVariableGetter> env_getter(
-      base::EnvironmentVariableGetter::Create());
+  scoped_ptr<base::EnvVarGetter> env_getter(base::EnvVarGetter::Create());
 
   switch (base::GetDesktopEnvironment(env_getter.get())) {
     case base::DESKTOP_ENVIRONMENT_GNOME:
     case base::DESKTOP_ENVIRONMENT_XFCE:
       return true;
     default:
       return false;
   }
 }
 
@@ skipping 390 matching lines @@
   cairo_set_line_width(cr, 1.0);
   cairo_move_to(cr, start_x, widget->allocation.y);
   cairo_line_to(cr, start_x,
                     widget->allocation.y + widget->allocation.height);
   cairo_stroke(cr);
   cairo_destroy(cr);
   cairo_pattern_destroy(pattern);
 
   return TRUE;
 }