Motown: Move responsibility for binding to MediaFactoryService::Product

services/media/factory_service/media_sink_impl.cc

 // Copyright 2016 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 "base/logging.h"
 #include "mojo/services/media/common/cpp/linear_transform.h"
 #include "mojo/services/media/common/cpp/local_time.h"
 #include "services/media/factory_service/media_sink_impl.h"
 #include "services/media/framework/util/conversion_pipeline_builder.h"
 #include "services/media/framework_mojo/mojo_type_conversions.h"
 
 namespace mojo {
 namespace media {
 
 // static
 std::shared_ptr<MediaSinkImpl> MediaSinkImpl::Create(
     const String& destination_url,
     MediaTypePtr media_type,
     InterfaceRequest<MediaSink> request,
     MediaFactoryService* owner) {
   return std::shared_ptr<MediaSinkImpl>(new MediaSinkImpl(
       destination_url, media_type.Pass(), request.Pass(), owner));
 }
 
 MediaSinkImpl::MediaSinkImpl(const String& destination_url,
                              MediaTypePtr media_type,
                              InterfaceRequest<MediaSink> request,
                              MediaFactoryService* owner)
-    : MediaFactoryService::Product(owner),
-      binding_(this, request.Pass()),
+    : MediaFactoryService::Product<MediaSink>(this, request.Pass(), owner),
       consumer_(MojoConsumer::Create()),
       producer_(MojoProducer::Create()) {
   DCHECK(destination_url);
   DCHECK(media_type);
 
-  // Go away when the client is no longer connected.
-  binding_.set_connection_error_handler([this]() { ReleaseFromOwner(); });
-
   status_publisher_.SetCallbackRunner(
       [this](const GetStatusCallback& callback, uint64_t version) {
         MediaSinkStatusPtr status = MediaSinkStatus::New();
         status->state = (producer_state_ == MediaState::PAUSED && rate_ != 0.0)
                             ? MediaState::PLAYING
                             : producer_state_;
         status->timeline_transform = status_transform_.Clone();
         callback.Run(version, status.Pass());
       });
 
@@ skipping 27 matching lines @@
 
   // TODO(dalesat): Temporary, remove.
   if (destination_url == "nowhere") {
     // Throwing away the content.
     graph_.ConnectParts(consumer_ref, producer_ref);
     graph_.Prepare();
     ready_.Occur();
     return;
   }
 
-  if (destination_url != "mojo:audio_server") {
-    LOG(ERROR) << "mojo:audio_server is the only supported destination";
-    if (binding_.is_bound()) {
-      binding_.Close();
-    }
-    return;
-  }
+  RCHECK(destination_url == "mojo:audio_server");
 
   // TODO(dalesat): Once we have c++14, get rid of this shared pointer hack.
   std::shared_ptr<StreamType> captured_stream_type(
       media_type.To<std::unique_ptr<StreamType>>().release());
 
   // An AudioTrackController knows how to talk to an audio track, interrogating
   // it for supported stream types and configuring it for the chosen stream
   // type.
   controller_.reset(new AudioTrackController(destination_url, app()));
 
@@ skipping 160 matching lines @@
   status_transform_->quad->target_delta = rate_frames_per_tick.denominator;
   LinearTransform::Ratio::Reduce(&status_transform_->quad->reference_delta,
                                  &status_transform_->quad->target_delta);
 
   rate_ = target_rate_;
   status_publisher_.SendUpdates();
 }
 
 }  // namespace media
 }  // namespace mojo