Commit 0784aa87 authored by Makoto Shimazu's avatar Makoto Shimazu Committed by Commit Bot

Convert base::Bind to base::Bind{Once,Repeating} in content/browser

This CL converts base::Bind to BindOnce or BindRepeating, and also changes
relevant base::Callbacks or base::Closures to appropriate types.

This CL is split from https://crrev.com/1831621.

This CL was uploaded by git cl split.

R=kenrb@chromium.org

Bug: 1007760
Change-Id: Ib302b0078a29a271d7093b42b948f878753ece28
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1849481Reviewed-by: default avatarKen Buchanan <kenrb@chromium.org>
Commit-Queue: Makoto Shimazu <shimazu@chromium.org>
Auto-Submit: Makoto Shimazu <shimazu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#705836}
parent f54280e9
...@@ -901,11 +901,11 @@ RenderFrameHostImpl::RenderFrameHostImpl( ...@@ -901,11 +901,11 @@ RenderFrameHostImpl::RenderFrameHostImpl(
SetUpMojoIfNeeded(); SetUpMojoIfNeeded();
swapout_event_monitor_timeout_.reset(new TimeoutMonitor(base::Bind( swapout_event_monitor_timeout_.reset(new TimeoutMonitor(base::BindRepeating(
&RenderFrameHostImpl::OnSwappedOut, weak_ptr_factory_.GetWeakPtr()))); &RenderFrameHostImpl::OnSwappedOut, weak_ptr_factory_.GetWeakPtr())));
beforeunload_timeout_.reset( beforeunload_timeout_.reset(new TimeoutMonitor(
new TimeoutMonitor(base::Bind(&RenderFrameHostImpl::BeforeUnloadTimeout, base::BindRepeating(&RenderFrameHostImpl::BeforeUnloadTimeout,
weak_ptr_factory_.GetWeakPtr()))); weak_ptr_factory_.GetWeakPtr())));
if (widget_routing_id != MSG_ROUTING_NONE) { if (widget_routing_id != MSG_ROUTING_NONE) {
mojo::PendingRemote<mojom::Widget> widget; mojo::PendingRemote<mojom::Widget> widget;
...@@ -4513,14 +4513,14 @@ void RenderFrameHostImpl::RegisterMojoInterfaces() { ...@@ -4513,14 +4513,14 @@ void RenderFrameHostImpl::RegisterMojoInterfaces() {
// |interface_registry_| is declared after |geolocation_service_|, so it // |interface_registry_| is declared after |geolocation_service_|, so it
// will be destroyed prior to |geolocation_service_|. // will be destroyed prior to |geolocation_service_|.
registry_->AddInterface( registry_->AddInterface(
base::Bind(&GeolocationServiceImpl::Bind, base::BindRepeating(&GeolocationServiceImpl::Bind,
base::Unretained(geolocation_service_.get()))); base::Unretained(geolocation_service_.get())));
} }
} }
registry_->AddInterface<media::mojom::InterfaceFactory>( registry_->AddInterface<media::mojom::InterfaceFactory>(base::BindRepeating(
base::Bind(&RenderFrameHostImpl::BindMediaInterfaceFactoryRequest, &RenderFrameHostImpl::BindMediaInterfaceFactoryRequest,
base::Unretained(this))); base::Unretained(this)));
registry_->AddInterface(base::BindRepeating( registry_->AddInterface(base::BindRepeating(
&RenderFrameHostImpl::CreateWebSocketConnector, base::Unretained(this))); &RenderFrameHostImpl::CreateWebSocketConnector, base::Unretained(this)));
...@@ -4541,8 +4541,8 @@ void RenderFrameHostImpl::RegisterMojoInterfaces() { ...@@ -4541,8 +4541,8 @@ void RenderFrameHostImpl::RegisterMojoInterfaces() {
base::Unretained(this))); base::Unretained(this)));
#if BUILDFLAG(ENABLE_MEDIA_REMOTING) #if BUILDFLAG(ENABLE_MEDIA_REMOTING)
registry_->AddInterface(base::Bind(&RemoterFactoryImpl::Bind, registry_->AddInterface(base::BindRepeating(
GetProcess()->GetID(), GetRoutingID())); &RemoterFactoryImpl::Bind, GetProcess()->GetID(), GetRoutingID()));
#endif // BUILDFLAG(ENABLE_MEDIA_REMOTING) #endif // BUILDFLAG(ENABLE_MEDIA_REMOTING)
// Only save decode stats when BrowserContext provides a VideoPerfHistory. // Only save decode stats when BrowserContext provides a VideoPerfHistory.
...@@ -4591,8 +4591,8 @@ void RenderFrameHostImpl::RegisterMojoInterfaces() { ...@@ -4591,8 +4591,8 @@ void RenderFrameHostImpl::RegisterMojoInterfaces() {
weak_ptr_factory_.GetWeakPtr()))); weak_ptr_factory_.GetWeakPtr())));
if (command_line->HasSwitch(cc::switches::kEnableGpuBenchmarking)) { if (command_line->HasSwitch(cc::switches::kEnableGpuBenchmarking)) {
registry_->AddInterface( registry_->AddInterface(base::BindRepeating(
base::Bind(&InputInjectorImpl::Create, weak_ptr_factory_.GetWeakPtr())); &InputInjectorImpl::Create, weak_ptr_factory_.GetWeakPtr()));
} }
// TODO(crbug.com/775792): Move to RendererInterfaceBinders. // TODO(crbug.com/775792): Move to RendererInterfaceBinders.
...@@ -6399,8 +6399,9 @@ void RenderFrameHostImpl::BindMediaInterfaceFactoryRequest( ...@@ -6399,8 +6399,9 @@ void RenderFrameHostImpl::BindMediaInterfaceFactoryRequest(
DCHECK(!media_interface_proxy_); DCHECK(!media_interface_proxy_);
media_interface_proxy_.reset(new MediaInterfaceProxy( media_interface_proxy_.reset(new MediaInterfaceProxy(
this, std::move(request), this, std::move(request),
base::Bind(&RenderFrameHostImpl::OnMediaInterfaceFactoryConnectionError, base::BindOnce(
base::Unretained(this)))); &RenderFrameHostImpl::OnMediaInterfaceFactoryConnectionError,
base::Unretained(this))));
} }
void RenderFrameHostImpl::CreateWebSocketConnector( void RenderFrameHostImpl::CreateWebSocketConnector(
...@@ -6732,7 +6733,8 @@ class RenderFrameHostImpl::JavaInterfaceProvider ...@@ -6732,7 +6733,8 @@ class RenderFrameHostImpl::JavaInterfaceProvider
: public service_manager::mojom::InterfaceProvider { : public service_manager::mojom::InterfaceProvider {
public: public:
using BindCallback = using BindCallback =
base::Callback<void(const std::string&, mojo::ScopedMessagePipeHandle)>; base::RepeatingCallback<void(const std::string&,
mojo::ScopedMessagePipeHandle)>;
JavaInterfaceProvider( JavaInterfaceProvider(
const BindCallback& bind_callback, const BindCallback& bind_callback,
...@@ -6761,8 +6763,9 @@ RenderFrameHostImpl::GetJavaRenderFrameHost() { ...@@ -6761,8 +6763,9 @@ RenderFrameHostImpl::GetJavaRenderFrameHost() {
if (!render_frame_host_android) { if (!render_frame_host_android) {
service_manager::mojom::InterfaceProviderPtr interface_provider_ptr; service_manager::mojom::InterfaceProviderPtr interface_provider_ptr;
java_interface_registry_ = std::make_unique<JavaInterfaceProvider>( java_interface_registry_ = std::make_unique<JavaInterfaceProvider>(
base::Bind(&RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame, base::BindRepeating(
weak_ptr_factory_.GetWeakPtr()), &RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame,
weak_ptr_factory_.GetWeakPtr()),
mojo::MakeRequest(&interface_provider_ptr)); mojo::MakeRequest(&interface_provider_ptr));
render_frame_host_android = render_frame_host_android =
new RenderFrameHostAndroid(this, std::move(interface_provider_ptr)); new RenderFrameHostAndroid(this, std::move(interface_provider_ptr));
...@@ -6790,7 +6793,7 @@ void RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame( ...@@ -6790,7 +6793,7 @@ void RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame(
#endif #endif
void RenderFrameHostImpl::ForEachImmediateLocalRoot( void RenderFrameHostImpl::ForEachImmediateLocalRoot(
const base::Callback<void(RenderFrameHostImpl*)>& callback) { const base::RepeatingCallback<void(RenderFrameHostImpl*)>& callback) {
if (!frame_tree_node_->child_count()) if (!frame_tree_node_->child_count())
return; return;
...@@ -6810,7 +6813,7 @@ void RenderFrameHostImpl::ForEachImmediateLocalRoot( ...@@ -6810,7 +6813,7 @@ void RenderFrameHostImpl::ForEachImmediateLocalRoot(
} }
void RenderFrameHostImpl::SetVisibilityForChildViews(bool visible) { void RenderFrameHostImpl::SetVisibilityForChildViews(bool visible) {
ForEachImmediateLocalRoot(base::Bind( ForEachImmediateLocalRoot(base::BindRepeating(
[](bool is_visible, RenderFrameHostImpl* frame_host) { [](bool is_visible, RenderFrameHostImpl* frame_host) {
if (auto* view = frame_host->GetView()) if (auto* view = frame_host->GetView())
return is_visible ? view->Show() : view->Hide(); return is_visible ? view->Show() : view->Hide();
......
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