Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(394)

Unified Diff: net/proxy/proxy_config_service_linux.cc

Issue 2003753002: Fix remoting_unittests that are failing on 32-bit linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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();
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();
client = libgio_loader_.g_settings_new(kProxyGConfSchema);
}
if (!client) {
« no previous file with comments | « build/linux/system.gyp ('k') | remoting/host/BUILD.gn » ('j') | remoting/host/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698