Revert "content: Start splitting up chrome/browser/ui/gtk/gtk_util.h"

chrome/browser/ui/gtk/infobars/infobar_gtk.cc

 // Copyright (c) 2011 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/infobars/infobar_gtk.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #include "chrome/browser/ui/gtk/custom_button.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/infobars/infobar_container_gtk.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/common/notification_service.h"
 #include "ui/base/gtk/gtk_expanded_container.h"
-#include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/gfx/gtk_util.h"
 #include "ui/gfx/image/image.h"
 
 namespace {
 
 // Pixels between infobar elements.
 const int kElementPadding = 5;
 
 // Extra padding on either end of info bar.
 const int kLeftPadding = 5;
@@ skipping 77 matching lines @@
 
 GdkColor InfoBarGtk::GetBorderColor() const {
   return theme_service_->GetBorderColor();
 }
 
 int InfoBarGtk::AnimatingHeight() const {
   return animation().is_animating() ? bar_target_height() : 0;
 }
 
 GtkWidget* InfoBarGtk::CreateLabel(const std::string& text) {
-  return theme_service_->BuildLabel(text, ui::kGdkBlack);
+  return theme_service_->BuildLabel(text, gtk_util::kGdkBlack);
 }
 
 GtkWidget* InfoBarGtk::CreateLinkButton(const std::string& text) {
   return theme_service_->BuildChromeLinkButton(text);
 }
 
 SkColor InfoBarGtk::ConvertGetColor(ColorGetter getter) {
   double r, g, b;
   (this->*getter)(delegate()->GetInfoBarType(), &r, &g, &b);
   return SkColorSetARGB(255, 255 * r, 255 * g, 255 * b);
@@ skipping 133 matching lines @@
                          const NotificationSource& source,
                          const NotificationDetails& details) {
   UpdateBorderColor();
 }
 
 void InfoBarGtk::OnChildSizeRequest(GtkWidget* expanded,
                                     GtkWidget* child,
                                     GtkRequisition* requisition) {
   requisition->height = -1;
 }