Revert 111695 - Have content/ create and destroy its own threads.

chrome/browser/ui/gtk/gtk_util.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/gtk_util.h"
 
 #include <cairo/cairo.h>
+#include <gdk/gdkx.h>
+#include <gtk/gtk.h>
 
 #include <cstdarg>
-
 #include <map>
 
 #include "base/environment.h"
 #include "base/i18n/rtl.h"
 #include "base/linux_util.h"
 #include "base/logging.h"
 #include "base/nix/xdg_util.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
@@ skipping 24 matching lines @@
 #include "ui/gfx/gtk_util.h"
 #include "ui/gfx/image/image.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/frame/browser_view.h"
 #include "chrome/browser/chromeos/native_dialog_window.h"
 #else
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #endif
 
-// These conflict with base/tracked_objects.h, so need to come last.
-#include <gdk/gdkx.h>
-#include <gtk/gtk.h>
-
 namespace {
 
 #if defined(GOOGLE_CHROME_BUILD)
 static const char* kIconName = "google-chrome";
 #else
 static const char* kIconName = "chromium-browser";
 #endif
 
 const char kBoldLabelMarkup[] = "<span weight='bold'>%s</span>";
 
@@ skipping 1136 matching lines @@
 
 void DoCopy(BrowserWindow* window) {
   DoCutCopyPaste(window, &RenderViewHost::Copy, "copy-clipboard");
 }
 
 void DoPaste(BrowserWindow* window) {
   DoCutCopyPaste(window, &RenderViewHost::Paste, "paste-clipboard");
 }
 
 }  // namespace gtk_util