| Index: net/proxy/proxy_config_service_linux.cc
|
| diff --git a/net/proxy/proxy_config_service_linux.cc b/net/proxy/proxy_config_service_linux.cc
|
| index 158fd5c1ff72d405eacec058b746d97065f7317b..489f14c98ac26be17dd16f5cd4e9ba4ca695b373 100644
|
| --- a/net/proxy/proxy_config_service_linux.cc
|
| +++ b/net/proxy/proxy_config_service_linux.cc
|
| @@ -4,15 +4,6 @@
|
|
|
| #include "net/proxy/proxy_config_service_linux.h"
|
|
|
| -// glib >=2.40 deprecate g_settings_list_schemas in favor of
|
| -// g_settings_schema_source_list_schemas. This function is not available on
|
| -// earlier versions that we still need to support (specifically, 2.32), so
|
| -// disable the warning.
|
| -// TODO(mgiuca): Remove this suppression when we drop support for Ubuntu 13.10
|
| -// (saucy) and earlier. Update the code to use
|
| -// g_settings_schema_source_list_schemas instead.
|
| -#define GLIB_DISABLE_DEPRECATION_WARNINGS
|
| -
|
| #include <errno.h>
|
| #include <fcntl.h>
|
| #if defined(USE_GCONF)
|
|
|