summaryrefslogtreecommitdiffstats
path: root/net/proxy
diff options
context:
space:
mode:
authormdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-25 21:59:22 +0000
committermdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-25 21:59:22 +0000
commitb8ecd144b5960978b37f2419215b9119239546b0 (patch)
tree9fbbb6d7669685a7530851fa18d1273abfcc850d /net/proxy
parent37842818f13d1b1b4f6b6095c46233ff0c3b5011 (diff)
downloadchromium_src-b8ecd144b5960978b37f2419215b9119239546b0.zip
chromium_src-b8ecd144b5960978b37f2419215b9119239546b0.tar.gz
chromium_src-b8ecd144b5960978b37f2419215b9119239546b0.tar.bz2
Properly detect KDE4 on newer systems (e.g. [K]Ubuntu 9.04).
BUG=25938 TEST=try to configure proxy settings on KDE4 when $DESKTOP_SESSION=kde, it should work Review URL: http://codereview.chromium.org/427013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33132 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy')
-rw-r--r--net/proxy/proxy_config_service_linux_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/proxy/proxy_config_service_linux_unittest.cc b/net/proxy/proxy_config_service_linux_unittest.cc
index 2ffe081..4ebc12e 100644
--- a/net/proxy/proxy_config_service_linux_unittest.cc
+++ b/net/proxy/proxy_config_service_linux_unittest.cc
@@ -1192,7 +1192,7 @@ TEST_F(ProxyConfigServiceLinuxTest, KDEConfigParser) {
MockEnvironmentVariableGetter* env_getter =
new MockEnvironmentVariableGetter;
// Force the KDE getter to be used and tell it where the test is.
- env_getter->values.DESKTOP_SESSION = "kde";
+ env_getter->values.DESKTOP_SESSION = "kde4";
env_getter->values.KDE_HOME = kde_home_.value().c_str();
SynchConfigGetter sync_config_getter(
new ProxyConfigServiceLinux(env_getter));