Motown: Don't build out pipelines for streams that don't get rendered.

services/media/factory_service/media_sink_impl.cc

Index: services/media/factory_service/media_sink_impl.cc
diff --git a/services/media/factory_service/media_sink_impl.cc b/services/media/factory_service/media_sink_impl.cc
index 6b845ee0560de7ca7df101ae179bee288329b009..953b8cb44328205fc620aad3fa1589c216d0dbcc 100644
--- a/services/media/factory_service/media_sink_impl.cc
+++ b/services/media/factory_service/media_sink_impl.cc
@@ -28,6 +28,7 @@ MediaSinkImpl::MediaSinkImpl(InterfaceHandle<MediaRenderer> renderer,
       consumer_(MojoConsumer::Create()),
       producer_(MojoProducer::Create()),
       renderer_(MediaRendererPtr::Create(renderer.Pass())) {
+  DCHECK(renderer_);
   DCHECK(media_type);
 
   PartRef consumer_ref = graph_.Add(consumer_);
@@ -49,15 +50,6 @@ MediaSinkImpl::MediaSinkImpl(InterfaceHandle<MediaRenderer> renderer,
         });
       });
 
-  // TODO(dalesat): Temporary, remove.
-  if (!renderer_) {
-    // Throwing away the content.
-    graph_.ConnectParts(consumer_ref, producer_ref);
-    graph_.Prepare();
-    ready_.Occur();
-    return;
-  }
-
   // TODO(dalesat): Once we have c++14, get rid of this shared pointer hack.
   input_stream_type_ = media_type.To<std::unique_ptr<StreamType>>();
 
@@ -101,41 +93,8 @@ void MediaSinkImpl::GetConsumer(InterfaceRequest<MediaConsumer> consumer) {
 
 void MediaSinkImpl::GetTimelineControlSite(
     InterfaceRequest<MediaTimelineControlSite> req) {
-  if (renderer_) {
-    renderer_->GetTimelineControlSite(req.Pass());
-    return;
-  }
-
-  new NullTimelineControlSite(req.Pass());
-}
-
-MediaSinkImpl::NullTimelineControlSite::NullTimelineControlSite(
-    InterfaceRequest<MediaTimelineControlSite> control_site_request)
-    : control_site_binding_(this, control_site_request.Pass()),
-      consumer_binding_(this) {}
-
-MediaSinkImpl::NullTimelineControlSite::~NullTimelineControlSite() {}
-
-void MediaSinkImpl::NullTimelineControlSite::GetStatus(
-    uint64_t version_last_seen,
-    const GetStatusCallback& callback) {
-  DCHECK(get_status_callback_.is_null());
-  get_status_callback_ = callback;
-}
-
-void MediaSinkImpl::NullTimelineControlSite::GetTimelineConsumer(
-    InterfaceRequest<TimelineConsumer> timeline_consumer) {
-  consumer_binding_.Bind(timeline_consumer.Pass());
-}
-
-void MediaSinkImpl::NullTimelineControlSite::SetTimelineTransform(
-    int64_t subject_time,
-    uint32_t reference_delta,
-    uint32_t subject_delta,
-    int64_t effective_reference_time,
-    int64_t effective_subject_time,
-    const SetTimelineTransformCallback& callback) {
-  callback.Run(true);
+  DCHECK(renderer_);
+  renderer_->GetTimelineControlSite(req.Pass());
 }
 
 }  // namespace media