summaryrefslogtreecommitdiffstats
path: root/net/proxy/proxy_service.cc
diff options
context:
space:
mode:
authorrobertshield@google.com <robertshield@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-22 15:00:26 +0000
committerrobertshield@google.com <robertshield@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-22 15:00:26 +0000
commit876d150b06190f15ea9c9758638f7b70714e37bd (patch)
treed503ec866563669f1668353a92b65a96ede475cb /net/proxy/proxy_service.cc
parente44cdf31522aff26c27759b1a06ae6eef8b97257 (diff)
downloadchromium_src-876d150b06190f15ea9c9758638f7b70714e37bd.zip
chromium_src-876d150b06190f15ea9c9758638f7b70714e37bd.tar.gz
chromium_src-876d150b06190f15ea9c9758638f7b70714e37bd.tar.bz2
Adding the ability to alter Chrome's proxy settings via the automation interface for automated testing.
Review URL: http://codereview.chromium.org/113482 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16741 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_service.cc')
-rw-r--r--net/proxy/proxy_service.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc
index a827389..65db636 100644
--- a/net/proxy/proxy_service.cc
+++ b/net/proxy/proxy_service.cc
@@ -518,6 +518,12 @@ void ProxyService::SetProxyScriptFetcher(
proxy_script_fetcher_.reset(proxy_script_fetcher);
}
+void ProxyService::ResetConfigService(
+ ProxyConfigService* new_proxy_config_service) {
+ config_service_.reset(new_proxy_config_service);
+ UpdateConfig();
+}
+
void ProxyService::DidCompletePacRequest(int config_id, int result_code) {
// If we get an error that indicates a bad PAC config, then we should
// remember that, and not try the PAC config again for a while.