From 3e44697f8e0749d2acd1d3ee1431a27df2c94e74 Mon Sep 17 00:00:00 2001
From: "sdoyon@chromium.org"
<sdoyon@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 22 May 2009 14:37:39 +0000
Subject: Fix gconf for the linux proxy config service.
-Reenables fetching of settings from gconf.
-Moves all gconf access to happen from the UI thread only, (where
the default glib main loop runs).
-Adds support for gconf notifications, avoiding having to poll the settings.
-Fixes a small initialization glitch in the unittest. Plus minor code style tweaks.
-Permanently removes gdk and glib threading initialization calls that
were previously disabled.
-Slight reorganization of ProxyService creation to pass down the IO
thread MessageLoop.
BUG=11111
TEST=none
Review URL: http://codereview.chromium.org/113043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16739 0039d316-1c4b-4281-b951-d872f2087c98
---
net/http/http_network_transaction_unittest.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'net/http')
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index 3d5fb44..627914e 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -347,7 +347,7 @@ ProxyService* CreateNullProxyService() {
ProxyService* CreateFixedProxyService(const std::string& proxy) {
net::ProxyConfig proxy_config;
proxy_config.proxy_rules.ParseFromString(proxy);
- return ProxyService::Create(&proxy_config);
+ return ProxyService::CreateFixed(proxy_config);
}
--
cgit v1.1