Send AndroidOverlay routing token from WMPI to AVDA.

content/renderer/render_frame_impl.cc

 // Copyright 2013 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 "content/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 2972 matching lines @@
           std::move(media_log),
           base::Bind(&ContentRendererClient::DeferMediaLoad,
                      base::Unretained(GetContentClient()->renderer()),
                      static_cast<RenderFrame*>(this),
                      GetWebMediaPlayerDelegate()->has_played_media()),
           audio_renderer_sink, render_thread->GetMediaThreadTaskRunner(),
           render_thread->GetWorkerTaskRunner(),
           render_thread->compositor_task_runner(), context_3d_cb,
           base::Bind(&v8::Isolate::AdjustAmountOfExternalAllocatedMemory,
                      base::Unretained(blink::MainThreadIsolate())),
-          initial_cdm, media_surface_manager_, media_observer,
-          max_keyframe_distance_to_disable_background_video,
+          initial_cdm, media_surface_manager_,
+          base::Bind(&RenderFrameImpl::RequestOverlayRoutingToken,
+                     base::Unretained(this)),
+          media_observer, max_keyframe_distance_to_disable_background_video,
           max_keyframe_distance_to_disable_background_video_mse,
           GetWebkitPreferences().enable_instant_source_buffer_gc,
           GetContentClient()->renderer()->AllowMediaSuspend(),
           embedded_media_experience_enabled));
 
   media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl(
       frame_, client, encrypted_client, GetWebMediaPlayerDelegate(),
       std::move(factory_selector), url_index_, std::move(params));
 
 #if defined(OS_ANDROID)  // WMPI_CAST
@@ skipping 2959 matching lines @@
 
 void RenderFrameImpl::OnSetOverlayRoutingToken(
     const base::UnguessableToken& token) {
   overlay_routing_token_ = token;
   for (const auto& cb : pending_routing_token_callbacks_)
     cb.Run(overlay_routing_token_.value());
   pending_routing_token_callbacks_.clear();
 }
 
 void RenderFrameImpl::RequestOverlayRoutingToken(
-    const media::RoutingTokenCallback& callback) {
+    media::RoutingTokenCallback callback) {
   if (overlay_routing_token_.has_value()) {
     callback.Run(overlay_routing_token_.value());
     return;
   }
 
   // Send a request to the host for the token.  We'll notify |callback| when it
   // arrives later.
   Send(new FrameHostMsg_RequestOverlayRoutingToken(routing_id_));
 
   pending_routing_token_callbacks_.push_back(callback);
@@ skipping 1120 matching lines @@
       policy(info.default_policy),
       replaces_current_history_item(info.replaces_current_history_item),
       history_navigation_in_new_child_frame(
           info.is_history_navigation_in_new_child_frame),
       client_redirect(info.is_client_redirect),
       cache_disabled(info.is_cache_disabled),
       form(info.form),
       source_location(info.source_location) {}
 
 }  // namespace content