Chromecast: replay buildfixes in SwitchingMediaRenderer code.

Double-revert seems to have deleted the fixes:
https://groups.google.com/a/chromium.org/forum/#!topic/chromium-dev/9ufqvcvv_DU

R=lcwu@chromium.org,servolk@chromium.org
BUG=None

Review URL: https://codereview.chromium.org/979913002

Cr-Commit-Position: refs/heads/master@{#319082}

chromecast/media/base/switching_media_renderer.cc

@@ -26,12 +26,13 @@ SwitchingMediaRenderer::~SwitchingMediaRenderer() {
 
 void SwitchingMediaRenderer::Initialize(
     ::media::DemuxerStreamProvider* demuxer_stream_provider,
-    const base::Closure& init_cb,
+    const ::media::PipelineStatusCB& init_cb,
     const ::media::StatisticsCB& statistics_cb,
     const ::media::BufferingStateCB& buffering_state_cb,
     const ::media::Renderer::PaintCB& paint_cb,
     const base::Closure& ended_cb,
-    const ::media::PipelineStatusCB& error_cb) {
+    const ::media::PipelineStatusCB& error_cb,
+    const base::Closure& waiting_for_decryption_key_cb) {
   // At this point the DemuxerStreamProvider should be fully initialized, so we
   // have enough information to decide which renderer to use.
   demuxer_stream_provider_ = demuxer_stream_provider;
@@ -50,9 +51,9 @@ void SwitchingMediaRenderer::Initialize(
     default_renderer_.reset();
   }
 
-  return GetRenderer()->Initialize(demuxer_stream_provider,
-                                   init_cb, statistics_cb, buffering_state_cb,
-                                   paint_cb, ended_cb, error_cb);
+  return GetRenderer()->Initialize(
+      demuxer_stream_provider, init_cb, statistics_cb, buffering_state_cb,
+      paint_cb, ended_cb, error_cb, waiting_for_decryption_key_cb);
 }
 
 ::media::Renderer* SwitchingMediaRenderer::GetRenderer() const {

chromecast/media/base/switching_media_renderer.h

@@ -33,12 +33,13 @@ class SwitchingMediaRenderer : public ::media::Renderer {
   // ::media::Renderer implementation:
   void Initialize(
       ::media::DemuxerStreamProvider* demuxer_stream_provider,
-      const base::Closure& init_cb,
+      const ::media::PipelineStatusCB& init_cb,
       const ::media::StatisticsCB& statistics_cb,
       const ::media::BufferingStateCB& buffering_state_cb,
       const ::media::Renderer::PaintCB& paint_cb,
       const base::Closure& ended_cb,
-      const ::media::PipelineStatusCB& error_cb) override;
+      const ::media::PipelineStatusCB& error_cb,
+      const base::Closure& waiting_for_decryption_key_cb) override;
   void SetCdm(::media::CdmContext* cdm_context,
               const ::media::CdmAttachedCB& cdm_attached_cb) override;
   void Flush(const base::Closure& flush_cb) override;

chromecast/renderer/media/chromecast_media_renderer_factory.cc

@@ -12,6 +12,7 @@
 #include "media/base/audio_hardware_config.h"
 #include "media/base/media_log.h"
 #include "media/renderers/default_renderer_factory.h"
+#include "media/renderers/gpu_video_accelerator_factories.h"
 
 namespace chromecast {
 namespace media {