Revert r123782.

chrome/browser/ui/gtk/bubble/bubble_gtk_browsertest.cc

Index: chrome/browser/ui/gtk/bubble/bubble_gtk_browsertest.cc
diff --git a/chrome/browser/ui/gtk/bubble/bubble_gtk_browsertest.cc b/chrome/browser/ui/gtk/bubble/bubble_gtk_browsertest.cc
index c9993c5fbd34806a2e2871138c2555b0169eb529..ecdb5416fe86b06f33905eaa4663bbe0a2323da1 100644
--- a/chrome/browser/ui/gtk/bubble/bubble_gtk_browsertest.cc
+++ b/chrome/browser/ui/gtk/bubble/bubble_gtk_browsertest.cc
@@ -9,8 +9,8 @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #include "chrome/browser/ui/gtk/bubble/bubble_gtk.h"
+#include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
-#include "chrome/browser/ui/gtk/theme_service_gtk.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 
@@ -72,7 +72,7 @@ IN_PROC_BROWSER_TEST_F(BubbleGtkTest, ArrowLocation) {
   };
 
   GtkWidget* anchor = GetNativeBrowserWindow();
-  ThemeServiceGtk* theme_service = ThemeServiceGtk::GetFrom(GetProfile());
+  GtkThemeService* theme_service = GtkThemeService::GetFrom(GetProfile());
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(points); ++i) {
     for (size_t j = 0; j < arraysize(kPreferredLocations); ++j) {
       static const char kText[] =
@@ -112,7 +112,7 @@ IN_PROC_BROWSER_TEST_F(BubbleGtkTest, NoArrow) {
   };
 
   GtkWidget* anchor = GetNativeBrowserWindow();
-  ThemeServiceGtk* theme_service = ThemeServiceGtk::GetFrom(GetProfile());
+  GtkThemeService* theme_service = GtkThemeService::GetFrom(GetProfile());
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(points); ++i) {
     for (size_t j = 0; j < arraysize(kPreferredLocations); ++j) {
       static const char kText[] =