Revert r123782.

chrome/browser/ui/gtk/extensions/extension_popup_gtk.cc

 // 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.
 
 #include "chrome/browser/ui/gtk/extensions/extension_popup_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/gtk/theme_service_gtk.h"
+#include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "googleurl/src/gurl.h"
 
 using content::RenderViewHost;
 
 ExtensionPopupGtk* ExtensionPopupGtk::current_extension_popup_ = NULL;
@@ skipping 142 matching lines @@
   BubbleGtk::ArrowLocationGtk arrow_location =
       !base::i18n::IsRTL() ?
       BubbleGtk::ARROW_LOCATION_TOP_RIGHT :
       BubbleGtk::ARROW_LOCATION_TOP_LEFT;
   bubble_ = BubbleGtk::Show(anchor_,
                             NULL,
                             host_->view()->native_view(),
                             arrow_location,
                             false,  // match_system_theme
                             true,   // grab_input
-                            ThemeServiceGtk::GetFrom(browser_->profile()),
+                            GtkThemeService::GetFrom(browser_->profile()),
                             this);
 }
 
 void ExtensionPopupGtk::DestroyPopupWithoutResult() {
   DestroyPopup();
 }
 
 gfx::Rect ExtensionPopupGtk::GetViewBounds() {
   GtkAllocation allocation;
   gtk_widget_get_allocation(host_->view()->native_view(), &allocation);
   return gfx::Rect(allocation);
 }