Motown: Rename MediaProducer/Consumer to MediaPacketProducer/Consumer

services/media/factory_service/media_sink_impl.h

Index: services/media/factory_service/media_sink_impl.h
diff --git a/services/media/factory_service/media_sink_impl.h b/services/media/factory_service/media_sink_impl.h
index eb8543a96b7b2b3857506dc765747f3feb6a8fb9..e0e4ec9affa69de7746b07d099bfa72593e9875b 100644
--- a/services/media/factory_service/media_sink_impl.h
+++ b/services/media/factory_service/media_sink_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_SERVICES_MEDIA_FACTORY_MEDIA_SINK_IMPL_H_
-#define MOJO_SERVICES_MEDIA_FACTORY_MEDIA_SINK_IMPL_H_
+#ifndef SERVICES_MEDIA_FACTORY_SERVICE_MEDIA_SINK_IMPL_H_
+#define SERVICES_MEDIA_FACTORY_SERVICE_MEDIA_SINK_IMPL_H_
 
 #include <memory>
 
@@ -13,8 +13,8 @@
 #include "services/media/factory_service/factory_service.h"
 #include "services/media/framework/graph.h"
 #include "services/media/framework/parts/decoder.h"
-#include "services/media/framework_mojo/mojo_consumer.h"
-#include "services/media/framework_mojo/mojo_producer.h"
+#include "services/media/framework_mojo/mojo_packet_consumer.h"
+#include "services/media/framework_mojo/mojo_packet_producer.h"
 #include "services/util/cpp/incident.h"
 
 namespace mojo {
@@ -34,7 +34,8 @@ class MediaSinkImpl : public MediaFactoryService::Product<MediaSink>,
   ~MediaSinkImpl() override;
 
   // MediaSink implementation.
-  void GetConsumer(InterfaceRequest<MediaConsumer> consumer) override;
+  void GetPacketConsumer(
+      InterfaceRequest<MediaPacketConsumer> consumer) override;
 
   void GetTimelineControlPoint(
       InterfaceRequest<MediaTimelineControlPoint> req) override;
@@ -47,8 +48,8 @@ class MediaSinkImpl : public MediaFactoryService::Product<MediaSink>,
 
   Incident ready_;
   Graph graph_;
-  std::shared_ptr<MojoConsumer> consumer_;
-  std::shared_ptr<MojoProducer> producer_;
+  std::shared_ptr<MojoPacketConsumer> consumer_;
+  std::shared_ptr<MojoPacketProducer> producer_;
   MediaRendererPtr renderer_;
   // The following fields are just temporaries used to solve lambda capture
   // problems.
@@ -58,4 +59,4 @@ class MediaSinkImpl : public MediaFactoryService::Product<MediaSink>,
 }  // namespace media
 }  // namespace mojo
 
-#endif  // MOJO_SERVICES_MEDIA_FACTORY_MEDIA_SINK_IMPL_H_
+#endif  // SERVICES_MEDIA_FACTORY_SERVICE_MEDIA_SINK_IMPL_H_