Motown: Change media type (stream type) representation

services/media/framework_mojo/mojo_formatting.h

Index: services/media/framework_mojo/mojo_formatting.h
diff --git a/services/media/framework_mojo/mojo_formatting.h b/services/media/framework_mojo/mojo_formatting.h
index 5bc83ce07850113a6e1f742b8956aa1001bc5951..262deebc17d72ffa40bde2cfd3796aa9af7ef7ec 100644
--- a/services/media/framework_mojo/mojo_formatting.h
+++ b/services/media/framework_mojo/mojo_formatting.h
@@ -19,10 +19,8 @@ namespace media {
 // See services/media/framework/ostream.h for details.
 
 // Mojo defines versions of operator<< for this that produce only numbers.
-const char* StringFromMediaTypeScheme(MediaTypeScheme value);
-const char* StringFromLpcmSampleFormat(LpcmSampleFormat value);
-const char* StringFromAudioEncoding(AudioEncoding value);
-const char* StringFromVideoEncoding(VideoEncoding value);
+const char* StringFromMediaTypeMedium(MediaTypeMedium value);
+const char* StringFromAudioSampleFormat(AudioSampleFormat value);
 const char* StringFromMediaState(MediaState value);
 
 // The following overloads add newlines.
@@ -35,21 +33,21 @@ std::ostream& operator<<(std::ostream& os, const MediaTypeSetPtr& value);
 std::ostream& operator<<(std::ostream& os, const MediaTypeDetailsPtr& value);
 std::ostream& operator<<(std::ostream& os, const MediaTypeSetDetailsPtr& value);
 std::ostream& operator<<(std::ostream& os,
-                         const MultiplexedMediaTypeDetailsPtr& value);
+                         const AudioMediaTypeDetailsPtr& value);
 std::ostream& operator<<(std::ostream& os,
-                         const MultiplexedMediaTypeSetDetailsPtr& value);
+                         const AudioMediaTypeSetDetailsPtr& value);
 std::ostream& operator<<(std::ostream& os,
-                         const LpcmMediaTypeDetailsPtr& value);
+                         const VideoMediaTypeDetailsPtr& value);
 std::ostream& operator<<(std::ostream& os,
-                         const LpcmMediaTypeSetDetailsPtr& value);
+                         const VideoMediaTypeSetDetailsPtr& value);
 std::ostream& operator<<(std::ostream& os,
-                         const CompressedAudioMediaTypeDetailsPtr& value);
+                         const TextMediaTypeDetailsPtr& value);
 std::ostream& operator<<(std::ostream& os,
-                         const CompressedAudioMediaTypeSetDetailsPtr& value);
+                         const TextMediaTypeSetDetailsPtr& value);
 std::ostream& operator<<(std::ostream& os,
-                         const VideoMediaTypeDetailsPtr& value);
+                         const SubpictureMediaTypeDetailsPtr& value);
 std::ostream& operator<<(std::ostream& os,
-                         const VideoMediaTypeSetDetailsPtr& value);
+                         const SubpictureMediaTypeSetDetailsPtr& value);
 std::ostream& operator<<(std::ostream& os,
                          const MediaSourceStreamDescriptorPtr& value);
 std::ostream& operator<<(std::ostream& os, const TimelineQuadPtr& value);