Motown: Rename MediaProducer/Consumer to MediaPacketProducer/Consumer

services/media/factory_service/media_demux_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/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "services/media/factory_service/media_demux_impl.h"
 #include "services/media/framework/parts/reader_cache.h"
 #include "services/media/framework/util/callback_joiner.h"
@@ skipping 78 matching lines @@
     for (size_t i = 0; i < streams_.size(); i++) {
       MediaSourceStreamDescriptorPtr descriptor =
           MediaSourceStreamDescriptor::New();
       result[i] = streams_[i]->media_type();
     }
 
     callback.Run(result.Pass());
   });
 }
 
-void MediaDemuxImpl::GetProducer(uint32_t stream_index,
-                                 InterfaceRequest<MediaProducer> producer) {
+void MediaDemuxImpl::GetPacketProducer(
+    uint32_t stream_index,
+    InterfaceRequest<MediaPacketProducer> producer) {
   RCHECK(init_complete_.occurred());
 
   if (stream_index >= streams_.size()) {
     return;
   }
 
-  streams_[stream_index]->GetProducer(producer.Pass());
+  streams_[stream_index]->GetPacketProducer(producer.Pass());
 }
 
 void MediaDemuxImpl::GetMetadata(uint64_t version_last_seen,
                                  const GetMetadataCallback& callback) {
   metadata_publisher_.Get(version_last_seen, callback);
 }
 
 void MediaDemuxImpl::Prime(const PrimeCallback& callback) {
   RCHECK(init_complete_.occurred());
 
@@ skipping 33 matching lines @@
   callback.Run();
 }
 
 MediaDemuxImpl::Stream::Stream(OutputRef output,
                                std::unique_ptr<StreamType> stream_type,
                                Graph* graph)
     : stream_type_(std::move(stream_type)), graph_(graph), output_(output) {
   DCHECK(stream_type_);
   DCHECK(graph);
 
-  producer_ = MojoProducer::Create();
+  producer_ = MojoPacketProducer::Create();
   graph_->ConnectOutputToPart(output_, graph_->Add(producer_));
 }
 
 MediaDemuxImpl::Stream::~Stream() {}
 
 MediaTypePtr MediaDemuxImpl::Stream::media_type() const {
   return MediaType::From(stream_type_);
 }
 
-void MediaDemuxImpl::Stream::GetProducer(
-    InterfaceRequest<MediaProducer> producer) {
+void MediaDemuxImpl::Stream::GetPacketProducer(
+    InterfaceRequest<MediaPacketProducer> producer) {
   DCHECK(producer_);
   producer_->AddBinding(producer.Pass());
 }
 
 void MediaDemuxImpl::Stream::PrimeConnection(
-    const MojoProducer::PrimeConnectionCallback callback) {
+    const MojoPacketProducer::PrimeConnectionCallback callback) {
   DCHECK(producer_);
   producer_->PrimeConnection(callback);
 }
 
 void MediaDemuxImpl::Stream::FlushConnection(
-    const MojoProducer::FlushConnectionCallback callback) {
+    const MojoPacketProducer::FlushConnectionCallback callback) {
   DCHECK(producer_);
   producer_->FlushConnection(callback);
 }
 
 }  // namespace media
 }  // namespace mojo