Re-add AC3/EAC3 audio demuxing support

media/formats/mp4/mp4_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 <algorithm>
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
@@ skipping 229 matching lines @@
 
 // Test a file where all video samples start with an Access Unit
 // Delimiter (AUD) NALU.
 TEST_F(MP4StreamParserTest, VideoSamplesStartWithAUDs) {
   ParseMP4File("bear-1280x720-av_with-aud-nalus_frag.mp4", 512);
 }
 
 // TODO(strobe): Create and test media which uses CENC auxiliary info stored
 // inside a private box
 
+#if defined(ENABLE_AC3_EAC3_AUDIO_DEMUXING)
+TEST_F(MP4StreamParserTest, DemuxingAC3) {
+  std::set<int> audio_object_types;
+  audio_object_types.insert(kAC3);
+  parser_.reset(new MP4StreamParser(audio_object_types, false));
+  ParseMP4File("bear-ac3-frag.mp4", 512);
+}
+
+TEST_F(MP4StreamParserTest, DemuxingEAC3) {
+  std::set<int> audio_object_types;
+  audio_object_types.insert(kEAC3);
+  parser_.reset(new MP4StreamParser(audio_object_types, false));
+  ParseMP4File("bear-eac3-frag.mp4", 512);
+}
+#endif
+
 }  // namespace mp4
 }  // namespace media