mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Rename ProxyService class to ProxyResolutionService

Browse source 
https://chromium-review.googlesource.com/857421
This commit is contained in:
Aleksei Kuzmin 2018-04-05 23:28:05 +02:00 • committed by Samuel Attard
commit 7c95100180
3 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
atom/browser/api/atom_api_session.cc
View file

@ -261,8 +261,8 @@ class ResolveProxyHelper {
const GURL& url) { const GURL& url) {
DCHECK_CURRENTLY_ON(content::BrowserThread::IO); DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
net::ProxyService* proxy_service = net::ProxyResolutionService* proxy_service =
context_getter->GetURLRequestContext()->proxy_service(); context_getter->GetURLRequestContext()->proxy_resolution_service();
net::CompletionCallback completion_callback = base::Bind( net::CompletionCallback completion_callback = base::Bind(
&ResolveProxyHelper::OnResolveProxyCompleted, base::Unretained(this)); &ResolveProxyHelper::OnResolveProxyCompleted, base::Unretained(this));
@ -278,7 +278,7 @@ class ResolveProxyHelper {
Session::ResolveProxyCallback callback_; Session::ResolveProxyCallback callback_;
net::ProxyInfo proxy_info_; net::ProxyInfo proxy_info_;
net::ProxyService::PacRequest* pac_req_; net::ProxyResolutionService::Request* pac_req_;
scoped_refptr<base::SingleThreadTaskRunner> original_thread_; scoped_refptr<base::SingleThreadTaskRunner> original_thread_;
DISALLOW_COPY_AND_ASSIGN(ResolveProxyHelper); DISALLOW_COPY_AND_ASSIGN(ResolveProxyHelper);
@ -344,7 +344,8 @@ void DoCacheActionInIO(
void SetProxyInIO(scoped_refptr<net::URLRequestContextGetter> getter, void SetProxyInIO(scoped_refptr<net::URLRequestContextGetter> getter,
const net::ProxyConfig& config, const net::ProxyConfig& config,
const base::Closure& callback) { const base::Closure& callback) {
auto* proxy_service = getter->GetURLRequestContext()->proxy_service(); auto* proxy_service =
getter->GetURLRequestContext()->proxy_resolution_service();
proxy_service->ResetConfigService( proxy_service->ResetConfigService(
base::WrapUnique(new net::ProxyConfigServiceFixed(config))); base::WrapUnique(new net::ProxyConfigServiceFixed(config)));
// Refetches and applies the new pac script if provided. // Refetches and applies the new pac script if provided.

3
brightray/browser/io_thread.cc
View file

@ -28,7 +28,8 @@ IOThread::~IOThread() {
void IOThread::Init() { void IOThread::Init() {
net::URLRequestContextBuilder builder; net::URLRequestContextBuilder builder;
builder.set_proxy_service(net::ProxyService::CreateDirect()); builder.set_proxy_resolution_service(
net::ProxyResolutionService::CreateDirect());
url_request_context_ = builder.Build(); url_request_context_ = builder.Build();
url_request_context_getter_ = new net::TrivialURLRequestContextGetter( url_request_context_getter_ = new net::TrivialURLRequestContextGetter(
url_request_context_.get(), base::ThreadTaskRunnerHandle::Get()); url_request_context_.get(), base::ThreadTaskRunnerHandle::Get());

16
brightray/browser/url_request_context_getter.cc
View file

@ -148,7 +148,8 @@ URLRequestContextGetter::URLRequestContextGetter(
// must synchronously run on the glib message loop. This will be passed to // must synchronously run on the glib message loop. This will be passed to
// the URLRequestContextStorage on the IO thread in GetURLRequestContext(). // the URLRequestContextStorage on the IO thread in GetURLRequestContext().
proxy_config_service_ = proxy_config_service_ =
net::ProxyService::CreateSystemProxyConfigService(io_task_runner_); net::ProxyResolutionService::CreateSystemProxyConfigService(
io_task_runner_);
} }
URLRequestContextGetter::~URLRequestContextGetter() {} URLRequestContextGetter::~URLRequestContextGetter() {}
@ -248,22 +249,25 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
// --proxy-server // --proxy-server
if (command_line.HasSwitch(switches::kNoProxyServer)) { if (command_line.HasSwitch(switches::kNoProxyServer)) {
storage_->set_proxy_service(net::ProxyService::CreateDirect()); storage_->set_proxy_resolution_service(
net::ProxyResolutionService::CreateDirect());
} else if (command_line.HasSwitch(switches::kProxyServer)) { } else if (command_line.HasSwitch(switches::kProxyServer)) {
net::ProxyConfig proxy_config; net::ProxyConfig proxy_config;
proxy_config.proxy_rules().ParseFromString( proxy_config.proxy_rules().ParseFromString(
command_line.GetSwitchValueASCII(switches::kProxyServer)); command_line.GetSwitchValueASCII(switches::kProxyServer));
proxy_config.proxy_rules().bypass_rules.ParseFromString( proxy_config.proxy_rules().bypass_rules.ParseFromString(
command_line.GetSwitchValueASCII(switches::kProxyBypassList)); command_line.GetSwitchValueASCII(switches::kProxyBypassList));
storage_->set_proxy_service(net::ProxyService::CreateFixed(proxy_config)); storage_->set_proxy_resolution_service(
net::ProxyResolutionService::CreateFixed(proxy_config));
} else if (command_line.HasSwitch(switches::kProxyPacUrl)) { } else if (command_line.HasSwitch(switches::kProxyPacUrl)) {
auto proxy_config = net::ProxyConfig::CreateFromCustomPacURL( auto proxy_config = net::ProxyConfig::CreateFromCustomPacURL(
GURL(command_line.GetSwitchValueASCII(switches::kProxyPacUrl))); GURL(command_line.GetSwitchValueASCII(switches::kProxyPacUrl)));
proxy_config.set_pac_mandatory(true); proxy_config.set_pac_mandatory(true);
storage_->set_proxy_service(net::ProxyService::CreateFixed(proxy_config)); storage_->set_proxy_resolution_service(
net::ProxyResolutionService::CreateFixed(proxy_config));
} else { } else {
storage_->set_proxy_service( storage_->set_proxy_resolution_service(
net::ProxyService::CreateUsingSystemProxyResolver( net::ProxyResolutionService::CreateUsingSystemProxyResolver(
std::move(proxy_config_service_), net_log_)); std::move(proxy_config_service_), net_log_));
} }