Utility process: initialize GTK when the sandbox is disabled.

content/utility/utility_thread_impl.cc

 // Copyright (c) 2012 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 "content/utility/utility_thread_impl.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_vector.h"
 #include "content/child/child_process.h"
 #include "content/child/webkitplatformsupport_impl.h"
 #include "content/common/child_process_messages.h"
 #include "content/common/plugin_list.h"
 #include "content/common/utility_messages.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/utility/content_utility_client.h"
 #include "ipc/ipc_sync_channel.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 
-#if defined(TOOLKIT_GTK)
-#include <gtk/gtk.h>
-
-#include "ui/gfx/gtk_util.h"
-#endif
-
 namespace content {
 
 namespace {
 
 template<typename SRC, typename DEST>
 void ConvertVector(const SRC& src, DEST* dest) {
   dest->reserve(src.size());
   for (typename SRC::const_iterator i = src.begin(); i != src.end(); ++i)
     dest->push_back(typename DEST::value_type(*i));
 }
@@ skipping 87 matching lines @@
 
 void UtilityThreadImpl::OnBatchModeFinished() {
   ChildProcess::current()->ReleaseProcess();
 }
 
 #if defined(OS_POSIX)
 void UtilityThreadImpl::OnLoadPlugins(
     const std::vector<base::FilePath>& plugin_paths) {
   PluginList* plugin_list = PluginList::Singleton();
 
-  // On Linux, some plugins expect the browser to have loaded glib/gtk. Do that
-  // before attempting to call into the plugin.
-  // g_thread_init API is deprecated since glib 2.31.0, please see release note:
-  // http://mail.gnome.org/archives/gnome-announce-list/2011-October/msg00041.html
-#if defined(TOOLKIT_GTK)
-#if !(GLIB_CHECK_VERSION(2, 31, 0))
-  if (!g_thread_get_initialized()) {
-    g_thread_init(NULL);
-  }
-#endif
-  gfx::GtkInitFromCommandLine(*CommandLine::ForCurrentProcess());
-#endif
-
   std::vector<WebPluginInfo> plugins;
   // TODO(bauerb): If we restart loading plug-ins, we might mess up the logic in
   // PluginList::ShouldLoadPlugin due to missing the previously loaded plug-ins
   // in |plugin_groups|.
   for (size_t i = 0; i < plugin_paths.size(); ++i) {
     WebPluginInfo plugin;
     if (!plugin_list->LoadPluginIntoPluginList(
         plugin_paths[i], &plugins, &plugin))
       Send(new UtilityHostMsg_LoadPluginFailed(i, plugin_paths[i]));
     else
       Send(new UtilityHostMsg_LoadedPlugin(i, plugin));
   }
 
   ReleaseProcessIfNeeded();
 }
 #endif
 
 }  // namespace content