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

chrome/browser/chromeos/input_method/xkeyboard.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/chromeos/input_method/xkeyboard.h"
 
 #include <queue>
 #include <set>
 #include <string>
 #include <utility>
 
+#include <X11/XKBlib.h>
+#include <X11/Xlib.h>
+#include <glib.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/system/runtime_environment.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/base/x/x11_util.h"
 
-// These includes conflict with base/tracked_objects.h so must come last.
-#include <X11/XKBlib.h>
-#include <X11/Xlib.h>
-#include <glib.h>
-
 using content::BrowserThread;
 
 namespace chromeos {
 namespace input_method {
 namespace {
 
 // The default keyboard layout name in the xorg config file.
 const char kDefaultLayoutName[] = "us";
 
 // The command we use to set the current XKB layout and modifier key mapping.
@@ skipping 493 matching lines @@
     case kCapsLockKey:
       return "capslock";
     case kNumModifierKeys:
       break;
   }
   return "";
 }
 
 }  // namespace input_method
 }  // namespace chromeos