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

Unified Diff: net/proxy/proxy_service.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/proxy_resolver_winhttp.cc ('k') | net/proxy/proxy_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_service.cc
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc
index 2b12c8e86116ce6a23e90fda3ced314711eb8cb0..61581219e94885870241172c3d41dfb489c880e0 100644
--- a/net/proxy/proxy_service.cc
+++ b/net/proxy/proxy_service.cc
@@ -175,7 +175,7 @@ class ProxyConfigServiceDirect : public ProxyConfigService {
// Proxy resolver that fails every time.
class ProxyResolverNull : public ProxyResolver {
public:
- ProxyResolverNull() : ProxyResolver(false /*expects_pac_bytes*/) {}
+ ProxyResolverNull() {}
// ProxyResolver implementation.
int GetProxyForURL(const GURL& url,
@@ -193,13 +193,6 @@ class ProxyResolverNull : public ProxyResolver {
return LOAD_STATE_IDLE;
}
- void CancelSetPacScript() override { NOTREACHED(); }
-
- int SetPacScript(
- const scoped_refptr<ProxyResolverScriptData>& /*script_data*/,
- const CompletionCallback& /*callback*/) override {
- return ERR_NOT_IMPLEMENTED;
- }
};
// ProxyResolver that simulates a PAC script which returns
@@ -207,8 +200,7 @@ class ProxyResolverNull : public ProxyResolver {
class ProxyResolverFromPacString : public ProxyResolver {
public:
explicit ProxyResolverFromPacString(const std::string& pac_string)
- : ProxyResolver(false /*expects_pac_bytes*/),
- pac_string_(pac_string) {}
+ : pac_string_(pac_string) {}
int GetProxyForURL(const GURL& url,
ProxyInfo* results,
@@ -226,13 +218,6 @@ class ProxyResolverFromPacString : public ProxyResolver {
return LOAD_STATE_IDLE;
}
- void CancelSetPacScript() override { NOTREACHED(); }
-
- int SetPacScript(const scoped_refptr<ProxyResolverScriptData>& pac_script,
- const CompletionCallback& callback) override {
- return OK;
- }
-
private:
const std::string pac_string_;
};
« no previous file with comments | « net/proxy/proxy_resolver_winhttp.cc ('k') | net/proxy/proxy_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698