Index: net/url_request/url_request_context_builder.h |
diff --git a/net/url_request/url_request_context_builder.h b/net/url_request/url_request_context_builder.h |
index a622625766ebdcdf6892354b37a6fdf839f03618..2c0443789216832c01aa0262da29aa9fd820631f 100644 |
--- a/net/url_request/url_request_context_builder.h |
+++ b/net/url_request/url_request_context_builder.h |
@@ -112,7 +112,7 @@ |
}; |
URLRequestContextBuilder(); |
- virtual ~URLRequestContextBuilder(); |
+ ~URLRequestContextBuilder(); |
// Sets a name for this URLRequestContext. Currently the name is used in |
// MemoryDumpProvier to annotate memory usage. The name does not need to be |
@@ -143,11 +143,6 @@ |
std::unique_ptr<ProxyConfigService> proxy_config_service) { |
proxy_config_service_ = std::move(proxy_config_service); |
} |
- |
- // Sets the proxy service. If one is not provided, by default, uses system |
- // libraries to evaluate PAC scripts, if available (And if not, skips PAC |
- // resolution). Subclasses may override CreateProxyService for different |
- // default behavior. |
void set_proxy_service(std::unique_ptr<ProxyService> proxy_service) { |
proxy_service_ = std::move(proxy_service); |
} |
@@ -335,17 +330,6 @@ |
std::unique_ptr<HttpServerProperties> http_server_properties); |
std::unique_ptr<URLRequestContext> Build(); |
- |
- protected: |
- // Lets subclasses override ProxyService creation, using a ProxyService that |
- // uses the URLRequestContext itself to get PAC scripts. When this method is |
- // invoked, the URLRequestContext is not yet ready to service requests. |
- virtual std::unique_ptr<ProxyService> CreateProxyService( |
- std::unique_ptr<ProxyConfigService> proxy_config_service, |
- URLRequestContext* url_request_context, |
- HostResolver* host_resolver, |
- NetworkDelegate* network_delegate, |
- NetLog* net_log); |
private: |
const char* name_; |