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 426fea1781aadc4310ed350823e4df4ca7b2a8b0..4f85f48e27124c93116475daeca3940171ffe19f 100644 |
--- a/net/tools/net_watcher/net_watcher.cc |
+++ b/net/tools/net_watcher/net_watcher.cc |
@@ -134,7 +134,12 @@ int main(int argc, char* argv[]) { |
#if (defined(OS_LINUX) || defined(OS_OPENBSD)) && !defined(OS_CHROMEOS) |
// Needed so ProxyConfigServiceLinux can use gconf. |
// Normally handled by BrowserMainLoop::InitializeToolkit(). |
+ // From glib version 2.36 onwards, g_type_init is implicitly called and it is |
+ // deprecated. |
+#pragma GCC diagnostic push |
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations" |
g_type_init(); |
+#pragma GCC diagnostic pop |
#endif |
base::AtExitManager exit_manager; |
CommandLine::Init(argc, argv); |