Commit 58a39b6a authored by Yannic Bonenberger's avatar Yannic Bonenberger Committed by Commit Bot

Apply base_bind_rewriters to //net/proxy_resolution

*** Note: There is no behavior change from this patch. ***

This CL replaces calls to base::{Bind,BindRepeating} with calls to
base::BindOnce, and removes calls to base::AdaptCallbackForRepeating
when the returned base::RepeatingCallback is immediately converted
to a base::OnceCallback.

This CL was uploaded by git cl split.

R=mmenke@chromium.org

Bug: 714018
Change-Id: Id81c3450f3dc9c2d4e0b9cf062b5ee43e1c71e30
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1778770Reviewed-by: default avatarMatt Menke <mmenke@chromium.org>
Commit-Queue: Matt Menke <mmenke@chromium.org>
Commit-Queue: Yannic Bonenberger <contact@yannic-bonenberger.com>
Auto-Submit: Yannic Bonenberger <contact@yannic-bonenberger.com>
Cr-Commit-Position: refs/heads/master@{#692309}
parent 5afcfd99
...@@ -737,7 +737,7 @@ TEST_F(MultiThreadedProxyResolverTest, CancelCreate) { ...@@ -737,7 +737,7 @@ TEST_F(MultiThreadedProxyResolverTest, CancelCreate) {
std::unique_ptr<ProxyResolver> resolver; std::unique_ptr<ProxyResolver> resolver;
EXPECT_EQ(ERR_IO_PENDING, resolver_factory.CreateProxyResolver( EXPECT_EQ(ERR_IO_PENDING, resolver_factory.CreateProxyResolver(
PacFileData::FromUTF8("pac script bytes"), PacFileData::FromUTF8("pac script bytes"),
&resolver, base::Bind(&Fail), &request)); &resolver, base::BindOnce(&Fail), &request));
EXPECT_TRUE(request); EXPECT_TRUE(request);
request.reset(); request.reset();
} }
...@@ -782,7 +782,7 @@ TEST_F(MultiThreadedProxyResolverTest, DestroyFactoryWithRequestsInProgress) { ...@@ -782,7 +782,7 @@ TEST_F(MultiThreadedProxyResolverTest, DestroyFactoryWithRequestsInProgress) {
kNumThreads, std::make_unique<BlockableProxyResolverFactory>()); kNumThreads, std::make_unique<BlockableProxyResolverFactory>());
EXPECT_EQ(ERR_IO_PENDING, resolver_factory.CreateProxyResolver( EXPECT_EQ(ERR_IO_PENDING, resolver_factory.CreateProxyResolver(
PacFileData::FromUTF8("pac script bytes"), PacFileData::FromUTF8("pac script bytes"),
&resolver, base::Bind(&Fail), &request)); &resolver, base::BindOnce(&Fail), &request));
EXPECT_TRUE(request); EXPECT_TRUE(request);
} }
// The factory destructor will block until the worker thread stops, but it may // The factory destructor will block until the worker thread stops, but it may
......
...@@ -286,7 +286,7 @@ int PacFileDecider::DoQuickCheck() { ...@@ -286,7 +286,7 @@ int PacFileDecider::DoQuickCheck() {
next_state_ = STATE_QUICK_CHECK_COMPLETE; next_state_ = STATE_QUICK_CHECK_COMPLETE;
quick_check_timer_.Start( quick_check_timer_.Start(
FROM_HERE, base::TimeDelta::FromMilliseconds(kQuickCheckDelayMs), FROM_HERE, base::TimeDelta::FromMilliseconds(kQuickCheckDelayMs),
base::BindRepeating(callback, ERR_NAME_NOT_RESOLVED)); base::BindOnce(callback, ERR_NAME_NOT_RESOLVED));
return resolve_request_->Start(callback); return resolve_request_->Start(callback);
} }
...@@ -323,7 +323,7 @@ int PacFileDecider::DoFetchPacScript() { ...@@ -323,7 +323,7 @@ int PacFileDecider::DoFetchPacScript() {
return dhcp_pac_file_fetcher_->Fetch( return dhcp_pac_file_fetcher_->Fetch(
&pac_script_, &pac_script_,
base::Bind(&PacFileDecider::OnIOCompletion, base::Unretained(this)), base::BindOnce(&PacFileDecider::OnIOCompletion, base::Unretained(this)),
net_log_, NetworkTrafficAnnotationTag(traffic_annotation_)); net_log_, NetworkTrafficAnnotationTag(traffic_annotation_));
} }
...@@ -334,7 +334,7 @@ int PacFileDecider::DoFetchPacScript() { ...@@ -334,7 +334,7 @@ int PacFileDecider::DoFetchPacScript() {
return pac_file_fetcher_->Fetch( return pac_file_fetcher_->Fetch(
effective_pac_url, &pac_script_, effective_pac_url, &pac_script_,
base::Bind(&PacFileDecider::OnIOCompletion, base::Unretained(this)), base::BindOnce(&PacFileDecider::OnIOCompletion, base::Unretained(this)),
NetworkTrafficAnnotationTag(traffic_annotation_)); NetworkTrafficAnnotationTag(traffic_annotation_));
} }
......
...@@ -571,9 +571,10 @@ class ProxyResolutionService::InitProxyResolver { ...@@ -571,9 +571,10 @@ class ProxyResolutionService::InitProxyResolver {
int DoDecidePacFile() { int DoDecidePacFile() {
next_state_ = STATE_DECIDE_PAC_FILE_COMPLETE; next_state_ = STATE_DECIDE_PAC_FILE_COMPLETE;
return decider_->Start( return decider_->Start(config_, wait_delay_,
config_, wait_delay_, proxy_resolver_factory_->expects_pac_bytes(), proxy_resolver_factory_->expects_pac_bytes(),
base::Bind(&InitProxyResolver::OnIOCompletion, base::Unretained(this))); base::BindOnce(&InitProxyResolver::OnIOCompletion,
base::Unretained(this)));
} }
int DoDecidePacFileComplete(int result) { int DoDecidePacFileComplete(int result) {
...@@ -593,7 +594,8 @@ class ProxyResolutionService::InitProxyResolver { ...@@ -593,7 +594,8 @@ class ProxyResolutionService::InitProxyResolver {
next_state_ = STATE_CREATE_RESOLVER_COMPLETE; next_state_ = STATE_CREATE_RESOLVER_COMPLETE;
return proxy_resolver_factory_->CreateProxyResolver( return proxy_resolver_factory_->CreateProxyResolver(
script_data_.data, proxy_resolver_, script_data_.data, proxy_resolver_,
base::Bind(&InitProxyResolver::OnIOCompletion, base::Unretained(this)), base::BindOnce(&InitProxyResolver::OnIOCompletion,
base::Unretained(this)),
&create_resolver_request_); &create_resolver_request_);
} }
...@@ -740,8 +742,8 @@ class ProxyResolutionService::PacFileDeciderPoller { ...@@ -740,8 +742,8 @@ class ProxyResolutionService::PacFileDeciderPoller {
decider_->set_quick_check_enabled(quick_check_enabled_); decider_->set_quick_check_enabled(quick_check_enabled_);
int result = decider_->Start( int result = decider_->Start(
config_, TimeDelta(), proxy_resolver_expects_pac_bytes_, config_, TimeDelta(), proxy_resolver_expects_pac_bytes_,
base::Bind(&PacFileDeciderPoller::OnPacFileDeciderCompleted, base::BindOnce(&PacFileDeciderPoller::OnPacFileDeciderCompleted,
base::Unretained(this))); base::Unretained(this)));
if (result != ERR_IO_PENDING) if (result != ERR_IO_PENDING)
OnPacFileDeciderCompleted(result); OnPacFileDeciderCompleted(result);
...@@ -945,8 +947,8 @@ int ProxyResolutionService::RequestImpl::Start() { ...@@ -945,8 +947,8 @@ int ProxyResolutionService::RequestImpl::Start() {
return resolver()->GetProxyForURL( return resolver()->GetProxyForURL(
url_, results_, url_, results_,
base::Bind(&ProxyResolutionService::RequestImpl::QueryComplete, base::BindOnce(&ProxyResolutionService::RequestImpl::QueryComplete,
base::Unretained(this)), base::Unretained(this)),
&resolve_job_, net_log_); &resolve_job_, net_log_);
} }
...@@ -1664,8 +1666,8 @@ void ProxyResolutionService::InitializeUsingLastFetchedConfig() { ...@@ -1664,8 +1666,8 @@ void ProxyResolutionService::InitializeUsingLastFetchedConfig() {
&resolver_, resolver_factory_.get(), pac_file_fetcher_.get(), &resolver_, resolver_factory_.get(), pac_file_fetcher_.get(),
dhcp_pac_file_fetcher_.get(), net_log_, fetched_config_.value(), dhcp_pac_file_fetcher_.get(), net_log_, fetched_config_.value(),
wait_delay, wait_delay,
base::Bind(&ProxyResolutionService::OnInitProxyResolverComplete, base::BindOnce(&ProxyResolutionService::OnInitProxyResolverComplete,
base::Unretained(this))); base::Unretained(this)));
if (rv != ERR_IO_PENDING) if (rv != ERR_IO_PENDING)
OnInitProxyResolverComplete(rv); OnInitProxyResolverComplete(rv);
...@@ -1686,8 +1688,8 @@ void ProxyResolutionService::InitializeUsingDecidedConfig( ...@@ -1686,8 +1688,8 @@ void ProxyResolutionService::InitializeUsingDecidedConfig(
int rv = init_proxy_resolver_->StartSkipDecider( int rv = init_proxy_resolver_->StartSkipDecider(
&resolver_, resolver_factory_.get(), effective_config, decider_result, &resolver_, resolver_factory_.get(), effective_config, decider_result,
script_data, script_data,
base::Bind(&ProxyResolutionService::OnInitProxyResolverComplete, base::BindOnce(&ProxyResolutionService::OnInitProxyResolverComplete,
base::Unretained(this))); base::Unretained(this)));
if (rv != ERR_IO_PENDING) if (rv != ERR_IO_PENDING)
OnInitProxyResolverComplete(rv); OnInitProxyResolverComplete(rv);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment