media: Use native DemuxerStream enum types in media mojo interfaces

media/filters/decoder_selector.cc

 // Copyright 2014 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 "media/filters/decoder_selector.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 15 matching lines @@
 #endif
 
 namespace media {
 
 static bool HasValidStreamConfig(DemuxerStream* stream) {
   switch (stream->type()) {
     case DemuxerStream::AUDIO:
       return stream->audio_decoder_config().IsValidConfig();
     case DemuxerStream::VIDEO:
       return stream->video_decoder_config().IsValidConfig();
+    case DemuxerStream::TEXT:
     case DemuxerStream::UNKNOWN:
-    case DemuxerStream::TEXT:
-    case DemuxerStream::NUM_TYPES:
       NOTREACHED();
   }
   return false;
 }
 
 static bool IsStreamEncrypted(DemuxerStream* stream) {
   switch (stream->type()) {
     case DemuxerStream::AUDIO:
       return stream->audio_decoder_config().is_encrypted();
     case DemuxerStream::VIDEO:
       return stream->video_decoder_config().is_encrypted();
+    case DemuxerStream::TEXT:
     case DemuxerStream::UNKNOWN:
-    case DemuxerStream::TEXT:
-    case DemuxerStream::NUM_TYPES:
       NOTREACHED();
   }
   return false;
 }
 
 template <DemuxerStream::Type StreamType>
 DecoderSelector<StreamType>::DecoderSelector(
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
     ScopedVector<Decoder> decoders,
     const scoped_refptr<MediaLog>& media_log)
@@ skipping 177 matching lines @@
 
 // These forward declarations tell the compiler that we will use
 // DecoderSelector with these arguments, allowing us to keep these definitions
 // in our .cc without causing linker errors. This also means if anyone tries to
 // instantiate a DecoderSelector with anything but these two specializations
 // they'll most likely get linker errors.
 template class DecoderSelector<DemuxerStream::AUDIO>;
 template class DecoderSelector<DemuxerStream::VIDEO>;
 
 }  // namespace media