Fix gconf for the linux proxy config service....

chrome/app/chrome_dll_main.cc

 // Copyright (c) 2006-2008 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.
 
 // TODO(port): the ifdefs in here are a first step towards trying to determine
 // the correct abstraction for all the OS functionality required at this
 // stage of process initialization. It should not be taken as a final
 // abstraction.
 
 #include "build/build_config.h"
@@ skipping 448 matching lines @@
   } else if (process_type == switches::kUtilityProcess) {
     rv = UtilityMain(main_params);
   } else if (process_type == switches::kWorkerProcess) {
 #if defined(OS_WIN)
     rv = WorkerMain(main_params);
 #else
     NOTIMPLEMENTED();
 #endif
   } else if (process_type.empty()) {
 #if defined(OS_LINUX)
-    // Glib/GDK type system and threading initializations. Needed at
-    // least for gconf usage in net/proxy/proxy_config_service_linux.cc.
-    // TODO(sdoyon): confirm whether gconf truly needs this. If so,
-    // the GTK main loop (message pump) must also be made to call
-    // gdk_threads_enter/leave(). Similar issue with the clipboard
-    // (estade@ deanm@).
+    // 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
+    // definitely harmless, so retained as a reminder of this
+    // requirement for gconf.
     g_type_init();
-#if 0  // gconf temporarily disabled because of races.
-       // See http://crbug.com/11442.
-    g_thread_init(NULL);
-    gdk_threads_init();
-#endif  // 0 (gconf disabled)
     // gtk_init() can change |argc| and |argv|, but nobody else uses them.
     gtk_init(&argc, const_cast<char***>(&argv));
     SetUpGLibLogHandler();
 #endif
 
     ScopedOleInitializer ole_initializer;
     rv = BrowserMain(main_params);
   } else {
     NOTREACHED() << "Unknown process type";
   }
 
   if (!process_type.empty()) {
     ResourceBundle::CleanupSharedInstance();
   }
 
 #if defined(OS_WIN)
 #ifdef _CRTDBG_MAP_ALLOC
   _CrtDumpMemoryLeaks();
 #endif  // _CRTDBG_MAP_ALLOC
 
   _Module.Term();
 #endif
 
   logging::CleanupChromeLogging();
 
   return rv;
 }