summaryrefslogtreecommitdiffstats
path: root/net/proxy/proxy_config_service_linux_unittest.cc
diff options
context:
space:
mode:
authormdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-10 02:36:20 +0000
committermdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-10 02:36:20 +0000
commitd306614067ea03aa3f4ad627f5e6079141d99bce (patch)
tree875a5a7300d2af91b28eeee6d9874562d26680ae /net/proxy/proxy_config_service_linux_unittest.cc
parent857aeb5d22d9b46950f5d4ac8020dab72ccf6a0c (diff)
downloadchromium_src-d306614067ea03aa3f4ad627f5e6079141d99bce.zip
chromium_src-d306614067ea03aa3f4ad627f5e6079141d99bce.tar.gz
chromium_src-d306614067ea03aa3f4ad627f5e6079141d99bce.tar.bz2
Linux: call WatchFileDescriptor on the file thread to monitor KDE proxy settings.
BUG=81405 Review URL: http://codereview.chromium.org/6954011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84743 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_config_service_linux_unittest.cc')
-rw-r--r--net/proxy/proxy_config_service_linux_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/proxy/proxy_config_service_linux_unittest.cc b/net/proxy/proxy_config_service_linux_unittest.cc
index 989e57c..5244b66 100644
--- a/net/proxy/proxy_config_service_linux_unittest.cc
+++ b/net/proxy/proxy_config_service_linux_unittest.cc
@@ -176,9 +176,9 @@ class MockGConfSettingGetter
return true;
}
- virtual void Shutdown() {}
+ virtual void ShutDown() {}
- virtual bool SetupNotification(ProxyConfigServiceLinux::Delegate* delegate) {
+ virtual bool SetUpNotifications(ProxyConfigServiceLinux::Delegate* delegate) {
return true;
}