Get net_watcher working on Gnome

net/tools/net_watcher/net_watcher.cc

Index: net/tools/net_watcher/net_watcher.cc
diff --git a/net/tools/net_watcher/net_watcher.cc b/net/tools/net_watcher/net_watcher.cc
index f756e971bf0a03c1ac365fa65de0d6e93441db15..cfe588b49ed5d2ad0f0c07f7d1c0ea3f37f92b28 100644
--- a/net/tools/net_watcher/net_watcher.cc
+++ b/net/tools/net_watcher/net_watcher.cc
@@ -21,6 +21,10 @@
 #include "net/proxy/proxy_config_service.h"
 #include "net/proxy/proxy_service.h"
 
+#if defined(OS_LINUX) || defined(OS_OPENBSD)
+#include <glib-object.h>
+#endif
+
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #endif
@@ -119,6 +123,11 @@ int main(int argc, char* argv[]) {
 #if defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool pool;
 #endif
+#if defined(OS_LINUX) || defined(OS_OPENBSD)
+  // Needed so ProxyConfigServiceLinux can use gconf.
+  // Normally handled by BrowserMainLoop::InitializeToolkit().
+  g_type_init();
+#endif
   base::AtExitManager exit_manager;
   CommandLine::Init(argc, argv);
   logging::InitLogging(