Add HE AAC support to ISO BMFF.

media/mp4/avc.h

Index: media/mp4/avc.h
diff --git a/media/mp4/avc.h b/media/mp4/avc.h
index 2767c145b855fed9ab67587b37d11b48d8022001..8e826b01dec39d80c2ffc803924292cebd963487 100644
--- a/media/mp4/avc.h
+++ b/media/mp4/avc.h
@@ -8,7 +8,6 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "media/base/channel_layout.h"
 #include "media/base/media_export.h"
 
 namespace media {
@@ -23,11 +22,8 @@ class MEDIA_EXPORT AVC {
   static bool InsertParameterSets(
       const AVCDecoderConfigurationRecord& avc_config,
       std::vector<uint8>* buffer);
-
-  static ChannelLayout ConvertAACChannelCountToChannelLayout(int count);
 };
 
-
 }  // namespace mp4
 }  // namespace media