Fix gconf for the linux proxy config service.

-Reenables fetching of settings from gconf.

-Moves all gconf access to happen from the UI thread only, (where
 the default glib main loop runs).

-Adds support for gconf notifications, avoiding having to poll the settings.

-Fixes a small initialization glitch in the unittest. Plus minor code style tweaks.

-Permanently removes gdk and glib threading initialization calls that
 were previously disabled.

-Slight reorganization of ProxyService creation to pass down the IO
 thread MessageLoop.

BUG=11111
TEST=none

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

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

1 files changed, 5 insertions, 11 deletions

diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc
index 42b1c26..658f2f2 100644
--- a/chrome/app/chrome_dll_main.cc
+++ b/chrome/app/chrome_dll_main.cc
@@ -469,18 +469,12 @@ int ChromeMain(int argc, const char** argv) {
 #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();