Revert "linux: call g_thread_init() at relevant startup points"

This reverts commit r24148 because the FDRemapping unittest is failing.

TBR=evanm

Review URL: http://codereview.chromium.org/173309


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24168 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 22 insertions, 6 deletions

diff --git a/base/test_suite.h b/base/test_suite.h
index 236c3ed..352c0b8 100644
--- a/base/test_suite.h
+++ b/base/test_suite.h
@@ -41,7 +41,6 @@ class TestSuite {
     CommandLine::Init(argc, argv);
     testing::InitGoogleTest(&argc, argv);
 #if defined(OS_LINUX)
-    g_thread_init(NULL);
     gtk_init_check(&argc, &argv);
 #endif
     // Don't add additional code to this constructor.  Instead add it to
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index e10c905..68b52be 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -9,15 +9,15 @@
       'type': 'settings',
       'direct_dependent_settings': {
         'cflags': [
-          '<!@(pkg-config --cflags gtk+-2.0 gthread-2.0)',
+          '<!@(pkg-config --cflags gtk+-2.0)',
         ],
       },
       'link_settings': {
         'ldflags': [
-          '<!@(pkg-config --libs-only-L --libs-only-other gtk+-2.0 gthread-2.0)',
+          '<!@(pkg-config --libs-only-L --libs-only-other gtk+-2.0)',
         ],
         'libraries': [
-          '<!@(pkg-config --libs-only-l gtk+-2.0 gthread-2.0)',
+          '<!@(pkg-config --libs-only-l gtk+-2.0)',
         ],
       },
     },
@@ -107,6 +107,23 @@
       },
     },
     {
+      'target_name': 'gthread',
+      'type': 'settings',
+      'direct_dependent_settings': {
+        'cflags': [
+          '<!@(pkg-config --cflags gthread-2.0)',
+        ],
+      },
+      'link_settings': {
+        'ldflags': [
+          '<!@(pkg-config --libs-only-L --libs-only-other gthread-2.0)',
+        ],
+        'libraries': [
+          '<!@(pkg-config --libs-only-l gthread-2.0)',
+        ],
+      },
+    },
+    {
       'target_name': 'x11',
       'type': 'settings',
       'direct_dependent_settings': {
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc
index 792d0ad..1783117 100644
--- a/chrome/app/chrome_dll_main.cc
+++ b/chrome/app/chrome_dll_main.cc
@@ -554,7 +554,6 @@ int ChromeMain(int argc, const char** argv) {
 #endif
   } else if (process_type.empty()) {
 #if defined(OS_LINUX)
-    g_thread_init(NULL);
     // Glib type system initialization. Needed at least for gconf,
     // used in net/proxy/proxy_config_service_linux.cc. Most likely
     // this is superfluous as gtk_init() ought to do this. It's
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index c368821..2ed58c8 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -3046,6 +3046,8 @@
             '<@(chromium_dependencies)',
             # Needed for chrome_dll_main.cc #include of gtk/gtk.h
             '../build/linux/system.gyp:gtk',
+            # Needed for chrome_dll_main.cc use of g_thread_init
+            '../build/linux/system.gyp:gthread',
           ],
           'sources': [
             'app/chrome_dll_main.cc',
diff --git a/chrome/plugin/plugin_thread.cc b/chrome/plugin/plugin_thread.cc
index 307cbaa..ae90e1a 100644
--- a/chrome/plugin/plugin_thread.cc
+++ b/chrome/plugin/plugin_thread.cc
@@ -35,7 +35,6 @@ PluginThread::PluginThread()
   {
     // XEmbed plugins assume they are hosted in a Gtk application, so we need
     // to initialize Gtk in the plugin process.
-    g_thread_init(NULL);
     const std::vector<std::string>& args =
         CommandLine::ForCurrentProcess()->argv();
     int argc = args.size();