diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-25 22:43:19 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-25 22:43:19 +0000 |
| commit | 53a1593319d54ffc522ffc3cfa4e7316773685b6 (patch) | |
| tree | 2ccd871e5660453847e6ad69c3023c98df2cd642 /net | |
| parent | 1b2158c787edd0fdc8fc8e06d196e631b14c38fd (diff) | |
| download | chromium_src-53a1593319d54ffc522ffc3cfa4e7316773685b6.zip chromium_src-53a1593319d54ffc522ffc3cfa4e7316773685b6.tar.gz chromium_src-53a1593319d54ffc522ffc3cfa4e7316773685b6.tar.bz2 | |
Merge 33132 - 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
TBR=mdm@chromium.org
Review URL: http://codereview.chromium.org/444006
git-svn-id: svn://svn.chromium.org/chrome/branches/249/src@33145 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/proxy/proxy_config_service_linux_unittest.cc | 2 |
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 26149e5..8eb70f2 100644 --- a/net/proxy/proxy_config_service_linux_unittest.cc +++ b/net/proxy/proxy_config_service_linux_unittest.cc @@ -1189,7 +1189,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)); |