diff options
| author | szym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-18 22:55:11 +0000 |
|---|---|---|
| committer | szym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-18 22:55:11 +0000 |
| commit | 7e6ea2a2ae8b6cb26b3224592b9ceaa296506cba (patch) | |
| tree | f379e988a68a660b5488061a14bc66a5109c6517 | |
| parent | 3277acfdb6c39abb46f7941f391f380ed2ec8dc7 (diff) | |
| download | chromium_src-7e6ea2a2ae8b6cb26b3224592b9ceaa296506cba.zip chromium_src-7e6ea2a2ae8b6cb26b3224592b9ceaa296506cba.tar.gz chromium_src-7e6ea2a2ae8b6cb26b3224592b9ceaa296506cba.tar.bz2 | |
Revert 157916
> [net] Connect DNS signals to re-fetching PAC script.
>
> BUG=128620
>
>
> Review URL: https://chromiumcodereview.appspot.com/10534102
Reverting in branch while we work out a long-term solution on trunk.
TBR=szym@chromium.org
Review URL: https://codereview.chromium.org/12017029
git-svn-id: svn://svn.chromium.org/chrome/branches/1364/src@177786 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/proxy/proxy_service.cc | 6 | ||||
| -rw-r--r-- | net/proxy/proxy_service.h | 5 |
2 files changed, 0 insertions, 11 deletions
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc index 17e46ed..92ed0c6 100644 --- a/net/proxy/proxy_service.cc +++ b/net/proxy/proxy_service.cc @@ -870,7 +870,6 @@ ProxyService::ProxyService(ProxyConfigService* config_service, stall_proxy_auto_config_delay_(TimeDelta::FromMilliseconds( kDelayAfterNetworkChangesMs)) { NetworkChangeNotifier::AddIPAddressObserver(this); - NetworkChangeNotifier::AddDNSObserver(this); ResetConfigService(config_service); } @@ -1026,7 +1025,6 @@ int ProxyService::TryToCompleteSynchronously(const GURL& url, ProxyService::~ProxyService() { NetworkChangeNotifier::RemoveIPAddressObserver(this); - NetworkChangeNotifier::RemoveDNSObserver(this); config_service_->RemoveObserver(this); // Cancel any inprogress requests. @@ -1492,10 +1490,6 @@ void ProxyService::OnIPAddressChanged() { ApplyProxyConfigIfAvailable(); } -void ProxyService::OnDNSChanged() { - OnIPAddressChanged(); -} - SyncProxyServiceHelper::SyncProxyServiceHelper(MessageLoop* io_message_loop, ProxyService* proxy_service) : io_message_loop_(io_message_loop), diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h index 12a4784..500d2a1 100644 --- a/net/proxy/proxy_service.h +++ b/net/proxy/proxy_service.h @@ -43,7 +43,6 @@ class ProxyScriptFetcher; // HTTP(S) URL. It uses the given ProxyResolver to handle the actual proxy // resolution. See ProxyResolverV8 for example. class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver, - public NetworkChangeNotifier::DNSObserver, public ProxyConfigService::Observer, NON_EXPORTED_BASE(public base::NonThreadSafe) { public: @@ -332,10 +331,6 @@ class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver, // When this is called, we re-fetch PAC scripts and re-run WPAD. virtual void OnIPAddressChanged() OVERRIDE; - // NetworkChangeNotifier::DNSObserver - // We respond as above. - virtual void OnDNSChanged() OVERRIDE; - // ProxyConfigService::Observer virtual void OnProxyConfigChanged( const ProxyConfig& config, |