Index: chromecast/net/connectivity_checker_impl.cc |
diff --git a/chromecast/net/connectivity_checker_impl.cc b/chromecast/net/connectivity_checker_impl.cc |
index b1b24eba9dc1f30eb8464738515fa3cab77764d0..56414f490d202ca7ca9916db8cad3ad9e2e191c0 100644 |
--- a/chromecast/net/connectivity_checker_impl.cc |
+++ b/chromecast/net/connectivity_checker_impl.cc |
@@ -18,8 +18,6 @@ |
#include "net/http/http_response_headers.h" |
#include "net/http/http_response_info.h" |
#include "net/http/http_status_code.h" |
-#include "net/proxy/proxy_config.h" |
-#include "net/proxy/proxy_config_service_fixed.h" |
#include "net/socket/ssl_client_socket.h" |
#include "net/url_request/url_request_context.h" |
#include "net/url_request/url_request_context_builder.h" |
@@ -58,13 +56,15 @@ const char kMetricNameNetworkConnectivityCheckingErrorType[] = |
} // namespace |
ConnectivityCheckerImpl::ConnectivityCheckerImpl( |
- const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) |
+ const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, |
+ std::unique_ptr<net::ProxyConfigService> proxy_config_service) |
: ConnectivityChecker(), |
task_runner_(task_runner), |
connected_(false), |
connection_type_(net::NetworkChangeNotifier::CONNECTION_NONE), |
check_errors_(0), |
- network_changed_pending_(false) { |
+ network_changed_pending_(false), |
+ proxy_config_service_(std::move(proxy_config_service)) { |
DCHECK(task_runner_.get()); |
task_runner->PostTask(FROM_HERE, |
base::Bind(&ConnectivityCheckerImpl::Initialize, this)); |
@@ -79,9 +79,8 @@ void ConnectivityCheckerImpl::Initialize() { |
check_url_str.empty() ? kDefaultConnectivityCheckUrl : check_url_str)); |
net::URLRequestContextBuilder builder; |
- builder.set_proxy_config_service( |
- base::MakeUnique<net::ProxyConfigServiceFixed>( |
- net::ProxyConfig::CreateDirect())); |
+ builder.set_proxy_config_service(std::move(proxy_config_service_)); |
+ |
builder.DisableHttpCache(); |
url_request_context_ = builder.Build(); |