Get net_watcher working on Gnome

net/tools/net_watcher/net_watcher.cc

 // Copyright (c) 2012 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.
 
 // This is a small utility that watches for and logs network changes.
 
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "net/base/network_change_notifier.h"
 #include "net/proxy/proxy_config.h"
 #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
 
 namespace {
 
 // Conversions from various network-related types to string.
 
 const char* ConnectionTypeToString(
     net::NetworkChangeNotifier::ConnectionType type) {
@@ skipping 78 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(NetWatcher);
 };
 
 }  // namespace
 
 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(
       NULL,
       logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG,
       logging::LOCK_LOG_FILE,
       logging::DELETE_OLD_LOG_FILE,
       logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
 
   // Just make the main message loop the network loop.
@@ skipping 37 matching lines @@
 
   proxy_config_service->RemoveObserver(&net_watcher);
 
   // Uses |network_change_notifier|.
   net::NetworkChangeNotifier::RemoveDNSObserver(&net_watcher);
   net::NetworkChangeNotifier::RemoveConnectionTypeObserver(&net_watcher);
   net::NetworkChangeNotifier::RemoveIPAddressObserver(&net_watcher);
 
   return 0;
 }