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 ac2c42d36be345df7efbc9073c5a1921dd18cdb8..f8a5184557244bbd4ed56ea4f2c3e6776eb2874f 100644 |
| --- a/net/proxy/proxy_config_service_linux.cc |
| +++ b/net/proxy/proxy_config_service_linux.cc |
| @@ -243,6 +243,7 @@ class SettingGetterImplGConf : public ProxyConfigServiceLinux::SettingGetter { |
| DCHECK(!client_); |
| DCHECK(!task_runner_.get()); |
| task_runner_ = glib_task_runner; |
| + g_type_init(); |
|
asanka
2016/05/27 17:03:27
Assuming this is still necessary, everywhere else
Tom (Use chromium acct)
2016/05/27 20:41:43
Done. Although I think this call should be harmle
|
| client_ = gconf_client_get_default(); |
| if (!client_) { |
| // It's not clear whether/when this can return NULL. |
| @@ -818,6 +819,7 @@ bool SettingGetterImplGSettings::LoadAndCheckVersion( |
| GSettings* client = NULL; |
| if (SchemaExists(kProxyGConfSchema)) { |
| ANNOTATE_SCOPED_MEMORY_LEAK; // http://crbug.com/380782 |
| + libgio_loader_.g_type_init(); |
|
asanka
2016/05/27 17:03:27
This call is a bit special since the specific vers
Tom (Use chromium acct)
2016/05/27 20:41:43
Added a runtime version check instead.
|
| client = libgio_loader_.g_settings_new(kProxyGConfSchema); |
| } |
| if (!client) { |