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

chrome/browser/ui/gtk/infobars/before_translate_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/before_translate_infobar_gtk.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "grit/generated_resources.h"
-#include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 
 BeforeTranslateInfoBar::BeforeTranslateInfoBar(
     TabContentsWrapper* owner,
     TranslateInfoBarDelegate* delegate)
     : TranslateInfoBarBase(owner, delegate) {
 }
 
 BeforeTranslateInfoBar::~BeforeTranslateInfoBar() {
 }
 
 void BeforeTranslateInfoBar::Init() {
   TranslateInfoBarBase::Init();
 
-  GtkWidget* hbox = gtk_hbox_new(FALSE, ui::kControlSpacing);
+  GtkWidget* hbox = gtk_hbox_new(FALSE, gtk_util::kControlSpacing);
   gtk_util::CenterWidgetInHBox(hbox_, hbox, false, 0);
   size_t offset = 0;
   string16 text =
       l10n_util::GetStringFUTF16(IDS_TRANSLATE_INFOBAR_BEFORE_MESSAGE,
                                  string16(), &offset);
 
   gtk_box_pack_start(GTK_BOX(hbox),
                      CreateLabel(UTF16ToUTF8(text.substr(0, offset))),
                      FALSE, FALSE, 0);
   GtkWidget* combobox =
@@ skipping 61 matching lines @@
   RemoveSelf();
 }
 
 void BeforeTranslateInfoBar::OnNeverTranslatePressed(GtkWidget* sender) {
   GetDelegate()->NeverTranslatePageLanguage();
 }
 
 void BeforeTranslateInfoBar::OnAlwaysTranslatePressed(GtkWidget* sender) {
   GetDelegate()->AlwaysTranslatePageLanguage();
 }