Support CAST+WMPI on android

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 2391 matching lines @@
   if (!media_renderer_factory.get()) {
     media_renderer_factory.reset(new media::DefaultRendererFactory(
         media_log, render_thread->GetGpuFactories(),
         *render_thread->GetAudioHardwareConfig()));
   }
 #endif  // defined(ENABLE_MOJO_MEDIA) && !defined(OS_ANDROID)
 
   if (!url_index_.get() || url_index_->frame() != frame)
     url_index_.reset(new media::UrlIndex(frame));
 
-  return new media::WebMediaPlayerImpl(
+  media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl(
       frame, client, encrypted_client, GetWebMediaPlayerDelegate()->AsWeakPtr(),
       std::move(media_renderer_factory), GetCdmFactory(), url_index_, params);
+#if defined(OS_ANDROID)  // WMPI_CAST

[nasko, 2016/01/15 20:08:37]

Please leave an empty line before and after the #ifdef'd code, since it makes it
more readable.

[hubbe, 2016/01/15 20:35:47]

Done.

+  media_player->SetMediaPlayerManager(GetMediaPlayerManager());
+#endif
+  return media_player;
 }
 
 blink::WebMediaSession* RenderFrameImpl::createMediaSession() {
 #if defined(OS_ANDROID)
   return new WebMediaSessionAndroid(GetMediaSessionManager());
 #else
   return nullptr;
 #endif  // defined(OS_ANDROID)
 }
 
@@ skipping 3293 matching lines @@
       media::ConvertToSwitchOutputDeviceCB(web_callbacks);
   scoped_refptr<media::AudioOutputDevice> device =
       AudioDeviceFactory::NewOutputDevice(routing_id_, 0, sink_id.utf8(),
                                           security_origin);
   media::OutputDeviceStatus status = device->GetDeviceStatus();
   device->Stop();
   callback.Run(status);
 }
 
 }  // namespace content