Chromium Code Reviews| 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 0e65b72c12acc4f561873b9e8a252ec6b7cbbd70..ce28246d2b41a9ca8633d225d27010f8a93eb6ae 100644 |
| --- a/net/proxy/proxy_config_service_linux.cc |
| +++ b/net/proxy/proxy_config_service_linux.cc |
| @@ -28,6 +28,7 @@ |
| #include "base/bind.h" |
| #include "base/compiler_specific.h" |
| +#include "base/debug/leak_annotations.h" |
| #include "base/environment.h" |
| #include "base/file_util.h" |
| #include "base/files/file_path.h" |
| @@ -815,9 +816,12 @@ bool SettingGetterImplGSettings::LoadAndCheckVersion( |
| } |
| } |
| - GSettings* client; |
| - if (!SchemaExists("org.gnome.system.proxy") || |
| - !(client = libgio_loader_.g_settings_new("org.gnome.system.proxy"))) { |
| + GSettings* client = NULL; |
| + if (SchemaExists("org.gnome.system.proxy")) { |
|
rvargas (doing something else)
2014/06/06 02:14:42
nit: there are 4 uses of this string in this file.
earthdok
2014/06/06 13:00:38
Done.
|
| + ANNOTATE_SCOPED_MEMORY_LEAK; // http://crbug.com/380782 |
| + client = libgio_loader_.g_settings_new("org.gnome.system.proxy"); |
| + } |
| + if (!client) { |
| VLOG(1) << "Cannot create gsettings client. Will fall back to gconf."; |
| return false; |
| } |