Utility process: move GTK initialization to the plugin loading code path.

content/utility/utility_thread_impl.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 "content/utility/utility_thread_impl.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 26 matching lines @@
 }
 
 }  // namespace
 
 UtilityThreadImpl::UtilityThreadImpl()
     : batch_mode_(false) {
   ChildProcess::current()->AddRefProcess();
   webkit_platform_support_.reset(new content::WebKitPlatformSupportImpl);
   WebKit::initialize(webkit_platform_support_.get());
   content::GetContentClient()->utility()->UtilityThreadStarted();
-
-  // On Linux, some plugins expect the browser to have loaded glib/gtk. Do that
-  // before attempting to call into the plugin.
-#if defined(TOOLKIT_USES_GTK)
-  g_thread_init(NULL);
-  gfx::GtkInitFromCommandLine(*CommandLine::ForCurrentProcess());
-#endif
 }
 
 UtilityThreadImpl::~UtilityThreadImpl() {
   WebKit::shutdown();
 }
 
 bool UtilityThreadImpl::Send(IPC::Message* msg) {
   return ChildThread::Send(msg);
 }
 
@@ skipping 70 matching lines @@
 void UtilityThreadImpl::OnBatchModeFinished() {
   ChildProcess::current()->ReleaseProcess();
 }
 
 #if defined(OS_POSIX)
 void UtilityThreadImpl::OnLoadPlugins(
     const std::vector<FilePath>& plugin_paths) {
   webkit::npapi::PluginList* plugin_list =
       webkit::npapi::PluginList::Singleton();
 
+  // On Linux, some plugins expect the browser to have loaded glib/gtk. Do that
+  // before attempting to call into the plugin.
+#if defined(TOOLKIT_USES_GTK)
+  CHECK(!g_thread_get_initialized());
+  g_thread_init(NULL);
+  gfx::GtkInitFromCommandLine(*CommandLine::ForCurrentProcess());
+#endif
+
   for (size_t i = 0; i < plugin_paths.size(); ++i) {
     ScopedVector<webkit::npapi::PluginGroup> plugin_groups;
     plugin_list->LoadPlugin(plugin_paths[i], &plugin_groups);
 
     if (plugin_groups.empty()) {
       Send(new UtilityHostMsg_LoadPluginFailed(i, plugin_paths[i]));
       continue;
     }
 
     const webkit::npapi::PluginGroup* group = plugin_groups[0];
     DCHECK_EQ(group->web_plugin_infos().size(), 1u);
 
     Send(new UtilityHostMsg_LoadedPlugin(i, group->web_plugin_infos().front()));
   }
 
   ReleaseProcessIfNeeded();
 }
 #endif