Move a bunch of random other files to src/ui/base...

chrome/plugin/plugin_thread.cc

 // Copyright (c) 2010 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/plugin/plugin_thread.h"
 
 #include "build/build_config.h"
 
 #if defined(USE_X11)
 #include <gtk/gtk.h>
@@ skipping 20 matching lines @@
 #include "net/base/net_errors.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/plugins/npapi/plugin_lib.h"
 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include "gfx/gtk_util.h"
 #endif
 
 #if defined(USE_X11)
-#include "app/x11_util.h"
+#include "ui/base/x/x11_util.h"
 #elif defined(OS_MACOSX)
 #include "app/l10n_util.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/sys_string_conversions.h"
 #include "grit/chromium_strings.h"
 #endif
 
 static base::LazyInstance<base::ThreadLocalPointer<PluginThread> > lazy_tls(
     base::LINKER_INITIALIZED);
@@ skipping 17 matching lines @@
     setenv("GDK_NATIVE_WINDOWS", "1", 1);
 
     gfx::GtkInitFromCommandLine(*CommandLine::ForCurrentProcess());
 
     // GTK after 2.18 resets the environment variable.  But if we're using
     // nspluginwrapper, that means it'll spawn its subprocess without the
     // environment variable!  So set it again.
     setenv("GDK_NATIVE_WINDOWS", "1", 1);
   }
 
-  x11_util::SetDefaultX11ErrorHandlers();
+  ui::SetDefaultX11ErrorHandlers();
 #endif
 
   PatchNPNFunctions();
 
   // Preload the library to avoid loading, unloading then reloading
   preloaded_plugin_module_ = base::LoadNativeLibrary(plugin_path_);
 
   ChromePluginLib::Create(plugin_path_, GetCPBrowserFuncsForPlugin());
 
   scoped_refptr<webkit::npapi::PluginLib> plugin(
@@ skipping 138 matching lines @@
   }
 
   if (!result || net_error != net::OK)
     return false;
 
   *proxy_list = proxy_result;
   return true;
 }
 
 }  // namespace webkit_glue