Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Unified Diff: net/proxy/multi_threaded_proxy_resolver.cc

Issue 1157163003: Remove ProxyResolver::(Cancel)SetPacScript and LegacyProxyResolverFactory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@v8-proxy-resolver-refactor
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/proxy/mojo_proxy_resolver_impl_unittest.cc ('k') | net/proxy/multi_threaded_proxy_resolver_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/multi_threaded_proxy_resolver.cc
diff --git a/net/proxy/multi_threaded_proxy_resolver.cc b/net/proxy/multi_threaded_proxy_resolver.cc
index 7c38275a7a1f2391a8a68cfaf8a9b77b46a8680b..d735787015762e71f8ccbf8094a65df4a3bcfdd1 100644
--- a/net/proxy/multi_threaded_proxy_resolver.cc
+++ b/net/proxy/multi_threaded_proxy_resolver.cc
@@ -119,9 +119,6 @@ class MultiThreadedProxyResolver : public ProxyResolver,
const BoundNetLog& net_log) override;
void CancelRequest(RequestHandle request) override;
LoadState GetLoadState(RequestHandle request) const override;
- void CancelSetPacScript() override;
- int SetPacScript(const scoped_refptr<ProxyResolverScriptData>& script_data,
- const CompletionCallback& callback) override;
private:
class GetProxyForURLJob;
@@ -424,8 +421,7 @@ MultiThreadedProxyResolver::MultiThreadedProxyResolver(
size_t max_num_threads,
const scoped_refptr<ProxyResolverScriptData>& script_data,
scoped_refptr<Executor> executor)
- : ProxyResolver(resolver_factory->expects_pac_bytes()),
- resolver_factory_(resolver_factory.Pass()),
+ : resolver_factory_(resolver_factory.Pass()),
max_num_threads_(max_num_threads),
script_data_(script_data) {
DCHECK(script_data_);
@@ -504,17 +500,6 @@ LoadState MultiThreadedProxyResolver::GetLoadState(RequestHandle req) const {
return LOAD_STATE_RESOLVING_PROXY_FOR_URL;
}
-void MultiThreadedProxyResolver::CancelSetPacScript() {
- NOTREACHED();
-}
-
-int MultiThreadedProxyResolver::SetPacScript(
- const scoped_refptr<ProxyResolverScriptData>& script_data,
- const CompletionCallback&callback) {
- NOTREACHED();
- return ERR_NOT_IMPLEMENTED;
-}
-
Executor* MultiThreadedProxyResolver::FindIdleExecutor() {
DCHECK(CalledOnValidThread());
for (ExecutorList::iterator it = executors_.begin();
« no previous file with comments | « net/proxy/mojo_proxy_resolver_impl_unittest.cc ('k') | net/proxy/multi_threaded_proxy_resolver_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698