net_watcher: Stop linking against glib/gconf/gio.

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 b623954c6e6a497c92224c5b8af412125900c5da..d0fd776d5b95e091a7bed27be903d36928c167c5 100644
--- a/net/tools/net_watcher/net_watcher.cc
+++ b/net/tools/net_watcher/net_watcher.cc
@@ -23,10 +23,6 @@
 #include "net/proxy/proxy_config_service.h"
 #include "net/proxy/proxy_service.h"
 
-#if defined(USE_GLIB) && !defined(OS_CHROMEOS)
-#include <glib-object.h>
-#endif
-
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 #include "net/base/network_change_notifier_linux.h"
 #endif
@@ -144,16 +140,6 @@ int main(int argc, char* argv[]) {
 #if defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool pool;
 #endif
-#if defined(USE_GLIB) && !defined(OS_CHROMEOS)
-  // g_type_init will be deprecated in 2.36. 2.35 is the development
-  // version for 2.36, hence do not call g_type_init starting 2.35.
-  // http://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#g-type-init
-#if !GLIB_CHECK_VERSION(2, 35, 0)
-  // Needed so ProxyConfigServiceLinux can use gconf.
-  // Normally handled by BrowserMainLoop::InitializeToolkit().
-  g_type_init();
-#endif
-#endif  // defined(USE_GLIB) && !defined(OS_CHROMEOS)
   base::AtExitManager exit_manager;
   base::CommandLine::Init(argc, argv);
   logging::LoggingSettings settings;