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..440f61b3b6530df10d53bc4aadb72ee6bf8ffef6 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)

[szym, 2012/11/16 16:35:41]

|| defined(OS_OPENBSD)
to match BrowserMainLoop::InitializeToolkit

[pauljensen, 2012/11/16 16:49:33]

digit1 thought it wasn't worth it as it's guarding code that's just under
OS_LINUX:
http://codereview.chromium.org/10912132/diff/69015/net/tools/get_server_time/...
I figured it couldn't hurt, and if we ever make FreeBSD use
ProxyConfigServiceLinux we'll need to do this anyhow.

+#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)

[szym, 2012/11/16 16:35:41]

ditto

+  // Needed so ProxyConfigServiceLinux can use gconf.
+  // Normally handled by BrowserMainLoop::InitializeToolkit().
+  g_type_init();

[szym, 2012/11/16 16:35:41]

I am surprised ProxyConfigServiceLinuxTest does not actually interrogate gconf.

+#endif
   base::AtExitManager exit_manager;
   CommandLine::Init(argc, argv);
   logging::InitLogging(