Revert 204313 "net_watcher does not build in Ubuntu 13.04"

trunk/src/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"
@@ skipping 109 matching lines @@
               << ProxyConfigToString(config) << ", "
               << ConfigAvailabilityToString(availability) << ")";
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NetWatcher);
 };
 
 }  // namespace
 
-// From glib version 2.36 onwards, g_type_init is implicitly called and it is
-// deprecated.
-#if (defined(OS_LINUX) || defined(OS_OPENBSD)) && !defined(OS_CHROMEOS)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
-
 int main(int argc, char* argv[]) {
 #if defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool pool;
 #endif
 #if (defined(OS_LINUX) || defined(OS_OPENBSD)) && !defined(OS_CHROMEOS)
   // Needed so ProxyConfigServiceLinux can use gconf.
   // Normally handled by BrowserMainLoop::InitializeToolkit().
   g_type_init();
 #endif
   base::AtExitManager exit_manager;
@@ skipping 48 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);
   net::NetworkChangeNotifier::RemoveNetworkChangeObserver(&net_watcher);
 
   return 0;
 }
-
-#if (defined(OS_LINUX) || defined(OS_OPENBSD)) && !defined(OS_CHROMEOS)
-#pragma GCC diagnostic pop
-#endif