Rewrite base::Bind to base::BindOnce in chrome/browser/media/router

This is a generated CL to rewrite base::Bind to base::BindOnce where
the result of base::Bind is immediately converted to OnceCallback.
E.g.:
  base::PostTask(FROM_HERE, base::Bind(&Foo));
is rewritten to:
  base::PostTask(FROM_HERE, base::BindOnce(&Foo));

An explainer of OnceCallback is available here goo.gl/YZiUL1.

The rewriting tool is in //tools/clang/base_bind_rewriters. To build and
run locally, follow //docs/clang_tool_refactoring.md.

This conversion makes almost no behavior change except that a bound
objects are passed-by-move to the target function.

Bug: 554299, 714018
Change-Id: Ief819fd7850d61a377300d61fd5a317104084c77
Reviewed-on: https://chromium-review.googlesource.com/547179Reviewed-by: mark a. foltz <mfoltz@chromium.org>
Commit-Queue: Taiju Tsuiki <tzik@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485892}

chrome/browser/media/router/browser_presentation_connection_proxy.cc

@@ -62,8 +62,8 @@ void BrowserPresentationConnectionProxy::OnMessagesReceived(
   // TODO(imcheng): It would be slightly more efficient to send messages in
   // a single batch.
   for (const auto& message : messages) {
-    target_connection_ptr_->OnMessage(message,
-                                      base::Bind(&OnMessageReceivedByRenderer));
+    target_connection_ptr_->OnMessage(
+        message, base::BindOnce(&OnMessageReceivedByRenderer));
   }
 }
 }  // namespace media_router

chrome/browser/media/router/create_presentation_connection_request_unittest.cc

@@ -70,10 +70,10 @@ TEST_F(CreatePresentationConnectionRequestTest, Getters) {
                                    "Unknown error.");
   CreatePresentationConnectionRequest request(
       render_frame_host_id_, presentation_urls_, url::Origin(GURL(kFrameUrl)),
-      base::Bind(&CreatePresentationConnectionRequestTest::FailOnSuccess,
-                 base::Unretained(this)),
-      base::Bind(&CreatePresentationConnectionRequestTest::OnError,
-                 base::Unretained(this), error));
+      base::BindOnce(&CreatePresentationConnectionRequestTest::FailOnSuccess,
+                     base::Unretained(this)),
+      base::BindOnce(&CreatePresentationConnectionRequestTest::OnError,
+                     base::Unretained(this), error));
 
   PresentationRequest presentation_request(
       render_frame_host_id_, presentation_urls_, url::Origin(GURL(kFrameUrl)));
@@ -87,10 +87,10 @@ TEST_F(CreatePresentationConnectionRequestTest, SuccessCallback) {
                                               kPresentationId);
   CreatePresentationConnectionRequest request(
       render_frame_host_id_, {presentation_url_}, url::Origin(GURL(kFrameUrl)),
-      base::Bind(&CreatePresentationConnectionRequestTest::OnSuccess,
-                 base::Unretained(this), presentation_info),
-      base::Bind(&CreatePresentationConnectionRequestTest::FailOnError,
-                 base::Unretained(this)));
+      base::BindOnce(&CreatePresentationConnectionRequestTest::OnSuccess,
+                     base::Unretained(this), presentation_info),
+      base::BindOnce(&CreatePresentationConnectionRequestTest::FailOnError,
+                     base::Unretained(this)));
   MediaRoute route(kRouteId, MediaSourceForTab(1), "sinkId", "Description",
                    false, "", false);
   request.InvokeSuccessCallback(kPresentationId, presentation_url_, route);
@@ -103,10 +103,10 @@ TEST_F(CreatePresentationConnectionRequestTest, ErrorCallback) {
       "This is an error message");
   CreatePresentationConnectionRequest request(
       render_frame_host_id_, presentation_urls_, url::Origin(GURL(kFrameUrl)),
-      base::Bind(&CreatePresentationConnectionRequestTest::FailOnSuccess,
-                 base::Unretained(this)),
-      base::Bind(&CreatePresentationConnectionRequestTest::OnError,
-                 base::Unretained(this), error));
+      base::BindOnce(&CreatePresentationConnectionRequestTest::FailOnSuccess,
+                     base::Unretained(this)),
+      base::BindOnce(&CreatePresentationConnectionRequestTest::OnError,
+                     base::Unretained(this), error));
   request.InvokeErrorCallback(error);
   EXPECT_TRUE(cb_invoked_);
 }

chrome/browser/media/router/discovery/dial/dial_media_sink_service_proxy.cc

@@ -28,7 +28,7 @@ void DialMediaSinkServiceProxy::Start() {
 
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
-      base::Bind(&DialMediaSinkServiceProxy::StartOnIOThread, this));
+      base::BindOnce(&DialMediaSinkServiceProxy::StartOnIOThread, this));
 }
 
 void DialMediaSinkServiceProxy::Stop() {
@@ -36,7 +36,7 @@ void DialMediaSinkServiceProxy::Stop() {
 
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
-      base::Bind(&DialMediaSinkServiceProxy::StopOnIOThread, this));
+      base::BindOnce(&DialMediaSinkServiceProxy::StopOnIOThread, this));
 }
 
 void DialMediaSinkServiceProxy::SetDialMediaSinkServiceForTest(
@@ -72,7 +72,7 @@ void DialMediaSinkServiceProxy::OnSinksDiscoveredOnIOThread(
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   content::BrowserThread::PostTask(
       content::BrowserThread::UI, FROM_HERE,
-      base::Bind(sink_discovery_callback_, std::move(sinks)));
+      base::BindOnce(sink_discovery_callback_, std::move(sinks)));
 }
 
 }  // namespace media_router

chrome/browser/media/router/discovery/discovery_network_monitor.cc

@@ -107,8 +107,8 @@ void DiscoveryNetworkMonitor::OnNetworkChanged(
     net::NetworkChangeNotifier::ConnectionType) {
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
-      base::Bind(&DiscoveryNetworkMonitor::UpdateNetworkInfo,
-                 base::Unretained(this)));
+      base::BindOnce(&DiscoveryNetworkMonitor::UpdateNetworkInfo,
+                     base::Unretained(this)));
 }
 
 void DiscoveryNetworkMonitor::UpdateNetworkInfo() {

chrome/browser/media/router/media_router_dialog_controller_unittest.cc

@@ -70,10 +70,10 @@ class MediaRouterDialogControllerTest : public ChromeRenderViewHostTestHarness {
             RenderFrameHostId(1, 2),
             {GURL("http://example.com"), GURL("http://example2.com")},
             url::Origin(GURL("http://google.com")),
-            base::Bind(&MediaRouterDialogControllerTest::RequestSuccess,
-                       base::Unretained(this)),
-            base::Bind(&MediaRouterDialogControllerTest::RequestError,
-                       base::Unretained(this))));
+            base::BindOnce(&MediaRouterDialogControllerTest::RequestSuccess,
+                           base::Unretained(this)),
+            base::BindOnce(&MediaRouterDialogControllerTest::RequestError,
+                           base::Unretained(this))));
   }
 
   std::unique_ptr<TestMediaRouterDialogController> dialog_controller_;

chrome/browser/media/router/mojo/media_route_controller.cc

@@ -38,7 +38,7 @@ MediaRouteController::MediaRouteController(
       binding_(this) {
   DCHECK(mojo_media_controller_.is_bound());
   DCHECK(media_router);
-  mojo_media_controller_.set_connection_error_handler(base::Bind(
+  mojo_media_controller_.set_connection_error_handler(base::BindOnce(
       &MediaRouteController::OnMojoConnectionError, base::Unretained(this)));
 }
 
@@ -88,7 +88,7 @@ mojom::MediaStatusObserverPtr MediaRouteController::BindObserverPtr() {
   DCHECK(!binding_.is_bound());
   mojom::MediaStatusObserverPtr observer;
   binding_.Bind(mojo::MakeRequest(&observer));
-  binding_.set_connection_error_handler(base::Bind(
+  binding_.set_connection_error_handler(base::BindOnce(
       &MediaRouteController::OnMojoConnectionError, base::Unretained(this)));
   return observer;
 }

chrome/browser/media/router/mojo/media_router_mojo_impl.cc

@@ -108,7 +108,7 @@ void MediaRouterMojoImpl::BindToMojoRequest(
 
   binding_ = base::MakeUnique<mojo::Binding<mojom::MediaRouter>>(
       this, std::move(request));
-  binding_->set_connection_error_handler(base::Bind(
+  binding_->set_connection_error_handler(base::BindOnce(
       &MediaRouterMojoImpl::OnConnectionError, base::Unretained(this)));
 
   event_page_request_manager_->SetExtensionId(extension.id());
@@ -140,7 +140,7 @@ void MediaRouterMojoImpl::RegisterMediaRouteProvider(
 #endif
 
   media_route_provider_ = std::move(media_route_provider_ptr);
-  media_route_provider_.set_connection_error_handler(base::Bind(
+  media_route_provider_.set_connection_error_handler(base::BindOnce(
       &MediaRouterMojoImpl::OnConnectionError, base::Unretained(this)));
 
   auto config = mojom::MediaRouteProviderConfig::New();
@@ -429,8 +429,9 @@ void MediaRouterMojoImpl::ProvideSinks(const std::string& provider_name,
                          << sinks.size() << " devices...";
 
   event_page_request_manager_->RunOrDefer(
-      base::Bind(&MediaRouterMojoImpl::DoProvideSinks,
-                 weak_factory_.GetWeakPtr(), provider_name, std::move(sinks)),
+      base::BindOnce(&MediaRouterMojoImpl::DoProvideSinks,
+                     weak_factory_.GetWeakPtr(), provider_name,
+                     std::move(sinks)),
       MediaRouteProviderWakeReason::PROVIDE_SINKS);
 }
 
@@ -604,8 +605,8 @@ void MediaRouterMojoImpl::RegisterRouteMessageObserver(
   observer_list->AddObserver(observer);
   if (should_listen) {
     event_page_request_manager_->RunOrDefer(
-        base::Bind(&MediaRouterMojoImpl::DoStartListeningForRouteMessages,
-                   weak_factory_.GetWeakPtr(), route_id),
+        base::BindOnce(&MediaRouterMojoImpl::DoStartListeningForRouteMessages,
+                       weak_factory_.GetWeakPtr(), route_id),
         MediaRouteProviderWakeReason::START_LISTENING_FOR_ROUTE_MESSAGES);
   }
 }
@@ -651,9 +652,9 @@ void MediaRouterMojoImpl::DoCreateRoute(
                          << ", presentation ID: " << presentation_id;
   media_route_provider_->CreateRoute(
       source_id, sink_id, presentation_id, origin, tab_id, timeout, incognito,
-      base::Bind(&MediaRouterMojoImpl::RouteResponseReceived,
-                 base::Unretained(this), presentation_id, incognito,
-                 base::Passed(&callbacks), false));
+      base::BindOnce(&MediaRouterMojoImpl::RouteResponseReceived,
+                     base::Unretained(this), presentation_id, incognito,
+                     base::Passed(&callbacks), false));
 }
 
 void MediaRouterMojoImpl::DoJoinRoute(
@@ -669,9 +670,9 @@ void MediaRouterMojoImpl::DoJoinRoute(
 
   media_route_provider_->JoinRoute(
       source_id, presentation_id, origin, tab_id, timeout, incognito,
-      base::Bind(&MediaRouterMojoImpl::RouteResponseReceived,
-                 base::Unretained(this), presentation_id, incognito,
-                 base::Passed(&callbacks), true));
+      base::BindOnce(&MediaRouterMojoImpl::RouteResponseReceived,
+                     base::Unretained(this), presentation_id, incognito,
+                     base::Passed(&callbacks), true));
 }
 
 void MediaRouterMojoImpl::DoConnectRouteByRouteId(
@@ -689,17 +690,16 @@ void MediaRouterMojoImpl::DoConnectRouteByRouteId(
 
   media_route_provider_->ConnectRouteByRouteId(
       source_id, route_id, presentation_id, origin, tab_id, timeout, incognito,
-      base::Bind(&MediaRouterMojoImpl::RouteResponseReceived,
-                 base::Unretained(this), presentation_id, incognito,
-                 base::Passed(&callbacks), true));
+      base::BindOnce(&MediaRouterMojoImpl::RouteResponseReceived,
+                     base::Unretained(this), presentation_id, incognito,
+                     base::Passed(&callbacks), true));
 }
 
 void MediaRouterMojoImpl::DoTerminateRoute(const MediaRoute::Id& route_id) {
   DVLOG_WITH_INSTANCE(1) << "DoTerminateRoute " << route_id;
   media_route_provider_->TerminateRoute(
-      route_id,
-      base::Bind(&MediaRouterMojoImpl::OnTerminateRouteResult,
-                 base::Unretained(this), route_id));
+      route_id, base::BindOnce(&MediaRouterMojoImpl::OnTerminateRouteResult,
+                               base::Unretained(this), route_id));
 }
 
 void MediaRouterMojoImpl::DoDetachRoute(const MediaRoute::Id& route_id) {
@@ -769,8 +769,8 @@ void MediaRouterMojoImpl::DoCreateMediaRouteController(
   media_route_provider_->CreateMediaRouteController(
       route_id, std::move(mojo_media_controller_request),
       std::move(mojo_observer),
-      base::Bind(&MediaRouterMojoImpl::OnMediaControllerCreated,
-                 base::Unretained(this), route_id));
+      base::BindOnce(&MediaRouterMojoImpl::OnMediaControllerCreated,
+                     base::Unretained(this), route_id));
 }
 
 void MediaRouterMojoImpl::OnRouteMessagesReceived(

chrome/browser/media/router/mojo/media_router_mojo_impl_unittest.cc

@@ -230,7 +230,7 @@ TEST_F(MediaRouterMojoImplTest, CreateRoute) {
                                 RouteRequestResult::OK))
       .WillOnce(InvokeWithoutArgs([&run_loop]() { run_loop.Quit(); }));
   std::vector<MediaRouteResponseCallback> route_response_callbacks;
-  route_response_callbacks.push_back(base::Bind(
+  route_response_callbacks.push_back(base::BindOnce(
       &RouteResponseCallbackHandler::Invoke, base::Unretained(&handler)));
   router()->CreateRoute(kSource, kSinkId, url::Origin(GURL(kOrigin)), nullptr,
                         std::move(route_response_callbacks),
@@ -269,7 +269,7 @@ TEST_F(MediaRouterMojoImplTest, CreateIncognitoRoute) {
                                 RouteRequestResult::OK))
       .WillOnce(InvokeWithoutArgs([&run_loop]() { run_loop.Quit(); }));
   std::vector<MediaRouteResponseCallback> route_response_callbacks;
-  route_response_callbacks.push_back(base::Bind(
+  route_response_callbacks.push_back(base::BindOnce(
       &RouteResponseCallbackHandler::Invoke, base::Unretained(&handler)));
   router()->CreateRoute(kSource, kSinkId, url::Origin(GURL(kOrigin)), nullptr,
                         std::move(route_response_callbacks),
@@ -300,7 +300,7 @@ TEST_F(MediaRouterMojoImplTest, CreateRouteFails) {
               DoInvoke(nullptr, "", kError, RouteRequestResult::TIMED_OUT))
       .WillOnce(InvokeWithoutArgs([&run_loop]() { run_loop.Quit(); }));
   std::vector<MediaRouteResponseCallback> route_response_callbacks;
-  route_response_callbacks.push_back(base::Bind(
+  route_response_callbacks.push_back(base::BindOnce(
       &RouteResponseCallbackHandler::Invoke, base::Unretained(&handler)));
   router()->CreateRoute(kSource, kSinkId, url::Origin(GURL(kOrigin)), nullptr,
                         std::move(route_response_callbacks),
@@ -332,7 +332,7 @@ TEST_F(MediaRouterMojoImplTest, CreateRouteIncognitoMismatchFails) {
                                 RouteRequestResult::INCOGNITO_MISMATCH))
       .WillOnce(InvokeWithoutArgs([&run_loop]() { run_loop.Quit(); }));
   std::vector<MediaRouteResponseCallback> route_response_callbacks;
-  route_response_callbacks.push_back(base::Bind(
+  route_response_callbacks.push_back(base::BindOnce(
       &RouteResponseCallbackHandler::Invoke, base::Unretained(&handler)));
   router()->CreateRoute(kSource, kSinkId, url::Origin(GURL(kOrigin)), nullptr,
                         std::move(route_response_callbacks),
@@ -421,7 +421,7 @@ TEST_F(MediaRouterMojoImplTest, JoinRoute) {
                                 RouteRequestResult::OK))
       .WillOnce(InvokeWithoutArgs([&run_loop]() { run_loop.Quit(); }));
   std::vector<MediaRouteResponseCallback> route_response_callbacks;
-  route_response_callbacks.push_back(base::Bind(
+  route_response_callbacks.push_back(base::BindOnce(
       &RouteResponseCallbackHandler::Invoke, base::Unretained(&handler)));
   router()->JoinRoute(kSource, kPresentationId, url::Origin(GURL(kOrigin)),
                       nullptr, std::move(route_response_callbacks),
@@ -437,7 +437,7 @@ TEST_F(MediaRouterMojoImplTest, JoinRouteNotFoundFails) {
                                 RouteRequestResult::ROUTE_NOT_FOUND))
       .WillOnce(InvokeWithoutArgs([&run_loop]() { run_loop.Quit(); }));
   std::vector<MediaRouteResponseCallback> route_response_callbacks;
-  route_response_callbacks.push_back(base::Bind(
+  route_response_callbacks.push_back(base::BindOnce(
       &RouteResponseCallbackHandler::Invoke, base::Unretained(&handler)));
   router()->JoinRoute(kSource, kPresentationId, url::Origin(GURL(kOrigin)),
                       nullptr, std::move(route_response_callbacks),
@@ -473,7 +473,7 @@ TEST_F(MediaRouterMojoImplTest, JoinRouteTimedOutFails) {
               DoInvoke(nullptr, "", kError, RouteRequestResult::TIMED_OUT))
       .WillOnce(InvokeWithoutArgs([&run_loop]() { run_loop.Quit(); }));
   std::vector<MediaRouteResponseCallback> route_response_callbacks;
-  route_response_callbacks.push_back(base::Bind(
+  route_response_callbacks.push_back(base::BindOnce(
       &RouteResponseCallbackHandler::Invoke, base::Unretained(&handler)));
   router()->JoinRoute(kSource, kPresentationId, url::Origin(GURL(kOrigin)),
                       nullptr, std::move(route_response_callbacks),
@@ -516,7 +516,7 @@ TEST_F(MediaRouterMojoImplTest, JoinRouteIncognitoMismatchFails) {
                                 RouteRequestResult::INCOGNITO_MISMATCH))
       .WillOnce(InvokeWithoutArgs([&run_loop]() { run_loop.Quit(); }));
   std::vector<MediaRouteResponseCallback> route_response_callbacks;
-  route_response_callbacks.push_back(base::Bind(
+  route_response_callbacks.push_back(base::BindOnce(
       &RouteResponseCallbackHandler::Invoke, base::Unretained(&handler)));
   router()->JoinRoute(kSource, kPresentationId, url::Origin(GURL(kOrigin)),
                       nullptr, std::move(route_response_callbacks),
@@ -556,7 +556,7 @@ TEST_F(MediaRouterMojoImplTest, ConnectRouteByRouteId) {
                                 RouteRequestResult::OK))
       .WillOnce(InvokeWithoutArgs([&run_loop]() { run_loop.Quit(); }));
   std::vector<MediaRouteResponseCallback> route_response_callbacks;
-  route_response_callbacks.push_back(base::Bind(
+  route_response_callbacks.push_back(base::BindOnce(
       &RouteResponseCallbackHandler::Invoke, base::Unretained(&handler)));
   router()->ConnectRouteByRouteId(
       kSource, kRouteId, url::Origin(GURL(kOrigin)), nullptr,
@@ -587,7 +587,7 @@ TEST_F(MediaRouterMojoImplTest, ConnectRouteByRouteIdFails) {
               DoInvoke(nullptr, "", kError, RouteRequestResult::TIMED_OUT))
       .WillOnce(InvokeWithoutArgs([&run_loop]() { run_loop.Quit(); }));
   std::vector<MediaRouteResponseCallback> route_response_callbacks;
-  route_response_callbacks.push_back(base::Bind(
+  route_response_callbacks.push_back(base::BindOnce(
       &RouteResponseCallbackHandler::Invoke, base::Unretained(&handler)));
   router()->ConnectRouteByRouteId(
       kSource, kRouteId, url::Origin(GURL(kOrigin)), nullptr,
@@ -624,7 +624,7 @@ TEST_F(MediaRouterMojoImplTest, ConnectRouteByIdIncognitoMismatchFails) {
                                 RouteRequestResult::INCOGNITO_MISMATCH))
       .WillOnce(InvokeWithoutArgs([&run_loop]() { run_loop.Quit(); }));
   std::vector<MediaRouteResponseCallback> route_response_callbacks;
-  route_response_callbacks.push_back(base::Bind(
+  route_response_callbacks.push_back(base::BindOnce(
       &RouteResponseCallbackHandler::Invoke, base::Unretained(&handler)));
   router()->ConnectRouteByRouteId(
       kSource, kRouteId, url::Origin(GURL(kOrigin)), nullptr,
@@ -978,8 +978,8 @@ TEST_F(MediaRouterMojoImplTest, SendRouteMessage) {
   EXPECT_CALL(handler, Invoke(true))
       .WillOnce(InvokeWithoutArgs([&run_loop]() { run_loop.Quit(); }));
   router()->SendRouteMessage(kRouteId, kMessage,
-                             base::Bind(&SendMessageCallbackHandler::Invoke,
-                                        base::Unretained(&handler)));
+                             base::BindOnce(&SendMessageCallbackHandler::Invoke,
+                                            base::Unretained(&handler)));
   run_loop.Run();
 }
 
@@ -1002,8 +1002,8 @@ TEST_F(MediaRouterMojoImplTest, SendRouteBinaryMessage) {
       .WillOnce(InvokeWithoutArgs([&run_loop]() { run_loop.Quit(); }));
   router()->SendRouteBinaryMessage(
       kRouteId, std::move(expected_binary_data),
-      base::Bind(&SendMessageCallbackHandler::Invoke,
-                 base::Unretained(&handler)));
+      base::BindOnce(&SendMessageCallbackHandler::Invoke,
+                     base::Unretained(&handler)));
   run_loop.Run();
 }
 
@@ -1211,7 +1211,7 @@ TEST_F(MediaRouterMojoImplTest, SearchSinks) {
 
   SinkResponseCallbackHandler sink_handler;
   EXPECT_CALL(sink_handler, Invoke(kSinkId2)).Times(1);
-  MediaSinkSearchResponseCallback sink_callback = base::Bind(
+  MediaSinkSearchResponseCallback sink_callback = base::BindOnce(
       &SinkResponseCallbackHandler::Invoke, base::Unretained(&sink_handler));
 
   router()->SearchSinks(kSinkId, kSource, search_input, domain,
@@ -1449,8 +1449,8 @@ class MediaRouterMojoExtensionTest : public ::testing::Test {
   void RegisterMediaRouteProvider() {
     media_router_proxy_->RegisterMediaRouteProvider(
         std::move(media_route_provider_proxy_),
-        base::Bind(&RegisterMediaRouteProviderHandler::Invoke,
-                   base::Unretained(&provider_handler_)));
+        base::BindOnce(&RegisterMediaRouteProviderHandler::Invoke,
+                       base::Unretained(&provider_handler_)));
   }
 
   void ProcessEventLoop() { base::RunLoop().RunUntilIdle(); }

chrome/browser/media/router/mojo/media_router_mojo_test.cc

@@ -77,8 +77,8 @@ void MediaRouterMojoTest::ConnectProviderManagerService() {
   EXPECT_CALL(provide_handler_, InvokeInternal(kInstanceId, testing::_));
   media_router_proxy_->RegisterMediaRouteProvider(
       std::move(mojo_media_router),
-      base::Bind(&RegisterMediaRouteProviderHandler::Invoke,
-                 base::Unretained(&provide_handler_)));
+      base::BindOnce(&RegisterMediaRouteProviderHandler::Invoke,
+                     base::Unretained(&provide_handler_)));
 }
 
 void MediaRouterMojoTest::SetUp() {

chrome/browser/media/router/presentation_service_delegate_impl_unittest.cc

@@ -459,10 +459,10 @@ TEST_F(PresentationServiceDelegateImplTest, ListenForConnnectionStateChange) {
   delegate_impl_->ReconnectPresentation(
       main_frame_process_id_, main_frame_routing_id_, presentation_urls_,
       kPresentationId,
-      base::Bind(&MockCreatePresentationConnnectionCallbacks::
-                     OnCreateConnectionSuccess,
-                 base::Unretained(&mock_create_connection_callbacks)),
-      base::Bind(
+      base::BindOnce(&MockCreatePresentationConnnectionCallbacks::
+                         OnCreateConnectionSuccess,
+                     base::Unretained(&mock_create_connection_callbacks)),
+      base::BindOnce(
           &MockCreatePresentationConnnectionCallbacks::OnCreateConnectionError,
           base::Unretained(&mock_create_connection_callbacks)));
 
@@ -702,10 +702,10 @@ TEST_F(PresentationServiceDelegateImplTest, AutoJoinRequest) {
   delegate_impl_->ReconnectPresentation(
       main_frame_process_id_, main_frame_routing_id_, presentation_urls_,
       kPresentationId,
-      base::Bind(&MockCreatePresentationConnnectionCallbacks::
-                     OnCreateConnectionSuccess,
-                 base::Unretained(&mock_create_connection_callbacks)),
-      base::Bind(
+      base::BindOnce(&MockCreatePresentationConnnectionCallbacks::
+                         OnCreateConnectionSuccess,
+                     base::Unretained(&mock_create_connection_callbacks)),
+      base::BindOnce(
           &MockCreatePresentationConnnectionCallbacks::OnCreateConnectionError,
           base::Unretained(&mock_create_connection_callbacks)));
 
@@ -722,10 +722,10 @@ TEST_F(PresentationServiceDelegateImplTest, AutoJoinRequest) {
   delegate_impl_->ReconnectPresentation(
       main_frame_process_id_, main_frame_routing_id_, presentation_urls_,
       kPresentationId,
-      base::Bind(&MockCreatePresentationConnnectionCallbacks::
-                     OnCreateConnectionSuccess,
-                 base::Unretained(&mock_create_connection_callbacks)),
-      base::Bind(
+      base::BindOnce(&MockCreatePresentationConnnectionCallbacks::
+                         OnCreateConnectionSuccess,
+                     base::Unretained(&mock_create_connection_callbacks)),
+      base::BindOnce(
           &MockCreatePresentationConnnectionCallbacks::OnCreateConnectionError,
           base::Unretained(&mock_create_connection_callbacks)));
 }
@@ -765,10 +765,10 @@ TEST_F(PresentationServiceDelegateImplIncognitoTest, AutoJoinRequest) {
   delegate_impl_->ReconnectPresentation(
       main_frame_process_id_, main_frame_routing_id_, presentation_urls_,
       kPresentationId,
-      base::Bind(&MockCreatePresentationConnnectionCallbacks::
-                     OnCreateConnectionSuccess,
-                 base::Unretained(&mock_create_connection_callbacks)),
-      base::Bind(
+      base::BindOnce(&MockCreatePresentationConnnectionCallbacks::
+                         OnCreateConnectionSuccess,
+                     base::Unretained(&mock_create_connection_callbacks)),
+      base::BindOnce(
           &MockCreatePresentationConnnectionCallbacks::OnCreateConnectionError,
           base::Unretained(&mock_create_connection_callbacks)));
 
@@ -785,10 +785,10 @@ TEST_F(PresentationServiceDelegateImplIncognitoTest, AutoJoinRequest) {
   delegate_impl_->ReconnectPresentation(
       main_frame_process_id_, main_frame_routing_id_, presentation_urls_,
       kPresentationId,
-      base::Bind(&MockCreatePresentationConnnectionCallbacks::
-                     OnCreateConnectionSuccess,
-                 base::Unretained(&mock_create_connection_callbacks)),
-      base::Bind(
+      base::BindOnce(&MockCreatePresentationConnnectionCallbacks::
+                         OnCreateConnectionSuccess,
+                     base::Unretained(&mock_create_connection_callbacks)),
+      base::BindOnce(
           &MockCreatePresentationConnnectionCallbacks::OnCreateConnectionError,
           base::Unretained(&mock_create_connection_callbacks)));
 }