Revert r123782.

chrome/browser/ui/gtk/one_click_signin_bubble_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/one_click_signin_bubble_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/gtk/browser_toolbar_gtk.h"
 #include "chrome/browser/ui/gtk/browser_window_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 "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 // Padding between content and edge of bubble (in pixels).
 const int kContentBorder = 7;
 
 }  // namespace
@@ skipping 13 matching lines @@
 
   // Message.
   GtkWidget* message_label = gtk_label_new(
       l10n_util::GetStringFUTF8(
           IDS_SYNC_PROMO_NTP_BUBBLE_MESSAGE,
           l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME)).c_str());
   gtk_label_set_line_wrap(GTK_LABEL(message_label), TRUE);
   gtk_misc_set_alignment(GTK_MISC(message_label), 0.0, 0.5);
   gtk_box_pack_start(GTK_BOX(bubble_content), message_label, FALSE, FALSE, 0);
 
-  ThemeServiceGtk* const theme_provider = ThemeServiceGtk::GetFrom(
+  GtkThemeService* const theme_provider = GtkThemeService::GetFrom(
       browser_window_gtk->browser()->profile());
 
   GtkWidget* learn_more_line = gtk_hbox_new(FALSE, kContentBorder);
   gtk_box_pack_start(GTK_BOX(bubble_content),
                      learn_more_line, FALSE, FALSE, 0);
 
   // Learn more link.
   GtkWidget* learn_more_link = theme_provider->BuildChromeLinkButton(
       l10n_util::GetStringUTF8(IDS_SYNC_PROMO_NTP_BUBBLE_LEARN_MORE));
   g_signal_connect(learn_more_link, "clicked",
@@ skipping 60 matching lines @@
 void OneClickSigninBubbleGtk::OnClickAdvancedLink(GtkWidget* link) {
   advanced_callback_.Run();
   bubble_->Close();
 }
 
 void OneClickSigninBubbleGtk::OnClickOK(GtkWidget* link) {
   bubble_->Close();
 }
 
 OneClickSigninBubbleGtk::~OneClickSigninBubbleGtk() {}