mojo::Callback -> base::Callback

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/media/router/mojo/media_router_mojo_impl.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 49 matching lines @@
       output->data.reset(new std::vector<uint8_t>);
       input->data.Swap(output->data.get());
       return output;
     }
   }
 
   NOTREACHED() << "Invalid route message type " << input->type;
   return output;
 }
 
+void ForwardSinkSearchCallback(const MediaSinkSearchResponseCallback& callback,
+                               mojo::String sink_id) {
+  callback.Run(sink_id);
+}
+
 }  // namespace
 
 MediaRouterMojoImpl::MediaRoutesQuery::MediaRoutesQuery() = default;
 
 MediaRouterMojoImpl::MediaRoutesQuery::~MediaRoutesQuery() = default;
 
 MediaRouterMojoImpl::MediaSinksQuery::MediaSinksQuery() = default;
 
 MediaRouterMojoImpl::MediaSinksQuery::~MediaSinksQuery() = default;
 
@@ skipping 183 matching lines @@
   FOR_EACH_OBSERVER(
       MediaRoutesObserver, it->second->observers,
       OnRoutesUpdated(routes_converted, joinable_routes_converted));
 }
 
 void MediaRouterMojoImpl::RouteResponseReceived(
     const std::string& presentation_id,
     bool off_the_record,
     const std::vector<MediaRouteResponseCallback>& callbacks,
     interfaces::MediaRoutePtr media_route,
-    const mojo::String& error_text,
+    mojo::String error_text,
     interfaces::RouteRequestResultCode result_code) {
   std::unique_ptr<RouteRequestResult> result;
   if (media_route.is_null()) {
     // An error occurred.
     DCHECK(!error_text.is_null());
     std::string error =
         !error_text.get().empty() ? error_text.get() : "Unknown error.";
     result = RouteRequestResult::FromError(
         error, mojo::RouteRequestResultCodeFromMojo(result_code));
   } else if (media_route->off_the_record != off_the_record) {
@@ skipping 446 matching lines @@
     const MediaSink::Id& sink_id,
     const MediaSource::Id& source_id,
     const std::string& search_input,
     const std::string& domain,
     const MediaSinkSearchResponseCallback& sink_callback) {
   DVLOG_WITH_INSTANCE(1) << "SearchSinks";
   auto sink_search_criteria = interfaces::SinkSearchCriteria::New();
   sink_search_criteria->input = search_input;
   sink_search_criteria->domain = domain;
   media_route_provider_->SearchSinks(
-      sink_id, source_id, std::move(sink_search_criteria), sink_callback);
+      sink_id, source_id, std::move(sink_search_criteria),
+      base::Bind(&ForwardSinkSearchCallback, sink_callback));
 }
 
 void MediaRouterMojoImpl::OnRouteMessagesReceived(
     const MediaRoute::Id& route_id,
     mojo::Array<interfaces::RouteMessagePtr> messages,
     bool error) {
   DVLOG(1) << "OnRouteMessagesReceived";
 
   // If |messages| is null, then no more messages will come from this route.
   // We can stop listening.
@@ skipping 280 matching lines @@
                         base::Unretained(this), source_id));
 }
 
 void MediaRouterMojoImpl::DoUpdateMediaSinks(
     const MediaSource::Id& source_id) {
   DVLOG_WITH_INSTANCE(1) << "DoUpdateMediaSinks" << source_id;
   media_route_provider_->UpdateMediaSinks(source_id);
 }
 
 }  // namespace media_router