Revert r123782.

chrome/browser/ui/gtk/gtk_util.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_UI_GTK_GTK_UTIL_H_
 #define CHROME_BROWSER_UI_GTK_GTK_UTIL_H_
 #pragma once
 
 #include <gtk/gtk.h>
 #include <string>
 #include <vector>
 
 #include "base/string16.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "webkit/glue/window_open_disposition.h"
 
 typedef struct _cairo cairo_t;
 typedef struct _GdkColor GdkColor;
 typedef struct _GtkWidget GtkWidget;
 
 class BrowserWindow;
-class ThemeServiceGtk;
+class GtkThemeService;
 class GURL;
 class Profile;
 
 namespace content {
 struct RendererPreferences;
 }
 
 namespace event_utils {
 
 // Translates GdkEvent state into what kind of disposition they represent.
@@ skipping 179 matching lines @@
 
 // Set up the text to be displayed by |layout|.
 void SetLayoutText(PangoLayout* layout, const string16& text);
 
 // Draws the background of the toolbar area subject to the expose rectangle
 // |event| and starting image tiling from |tabstrip_origin|.
 void DrawThemedToolbarBackground(GtkWidget* widget,
                                  cairo_t* cr,
                                  GdkEventExpose* event,
                                  const gfx::Point& tabstrip_origin,
-                                 ThemeServiceGtk* provider);
+                                 GtkThemeService* provider);
 
 // Returns the two colors averaged together.
 GdkColor AverageColors(GdkColor color_one, GdkColor color_two);
 
 // Show the image for the given menu item, even if the user's default is to not
 // show images. Only to be used for favicons or other menus where the image is
 // crucial to its functionality.
 void SetAlwaysShowImage(GtkWidget* image_menu_item);
 
 // Get a rectangle corresponding to a widget's allocation relative to its
@@ skipping 91 matching lines @@
 void ApplyMessageDialogQuirks(GtkWidget* dialog);
 
 // Performs Cut/Copy/Paste operation on the |window|.
 void DoCut(BrowserWindow* window);
 void DoCopy(BrowserWindow* window);
 void DoPaste(BrowserWindow* window);
 
 }  // namespace gtk_util
 
 #endif  // CHROME_BROWSER_UI_GTK_GTK_UTIL_H_