media: Use native DemuxerStream enum types in media mojo interfaces

media/base/stream_parser_unittest.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 <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 #include <map>
 #include <sstream>
@@ skipping 31 matching lines @@
 // |queue|. |decode_timestamps| determines the number of appended buffers and
 // their sequence of decode timestamps; a |kEnd| timestamp indicates the
 // end of the sequence and no buffer is appended for it. Each new buffer's
 // type will be |type| with track ID set to |track_id|.
 static void GenerateBuffers(const int* decode_timestamps,
                             StreamParserBuffer::Type type,
                             TrackId track_id,
                             BufferQueue* queue) {
   DCHECK(decode_timestamps);
   DCHECK(queue);
-  DCHECK_NE(type, DemuxerStream::UNKNOWN);
-  DCHECK_LT(type, DemuxerStream::NUM_TYPES);
+  DCHECK_LT(type, DemuxerStream::UNKNOWN);

[jrummell, 2016/10/14 22:13:24]

Should this not be TYPE_MAX? UNKNOWN is 0. Maybe keep the original test as well
(!= UNKNOWN)?

[xhwang, 2016/10/15 05:13:22]

Good catch. Done.

   for (int i = 0; decode_timestamps[i] != kEnd; ++i) {
     scoped_refptr<StreamParserBuffer> buffer =
         StreamParserBuffer::CopyFrom(kFakeData, sizeof(kFakeData),
                                      true, type, track_id);
     buffer->SetDecodeTimestamp(
         DecodeTimestamp::FromMicroseconds(decode_timestamps[i]));
     queue->push_back(buffer);
   }
 }
 
@@ skipping 300 matching lines @@
   VerifyMergeSuccess(expected, true);
 
   // But appending something with a lower timestamp than the last timestamp
   // in the pre-existing merge result should fail.
   int more_audio_timestamps[] = { 106, kEnd };
   GenerateAudioBuffers(more_audio_timestamps);
   VerifyMergeFailure();
 }
 
 }  // namespace media