Revert of Flip proprietary codecs to false for Android chromium builds.

media/filters/audio_decoder_unittest.cc

Index: media/filters/audio_decoder_unittest.cc
diff --git a/media/filters/audio_decoder_unittest.cc b/media/filters/audio_decoder_unittest.cc
index d29a68d86c9ba6590fc6ae4329b820f685f04545..c4f727bfcbced9f356e7034b84e55a00cabf5c28 100644
--- a/media/filters/audio_decoder_unittest.cc
+++ b/media/filters/audio_decoder_unittest.cc
@@ -503,6 +503,7 @@
                         testing::ValuesIn(kOpusBehavioralTest));
 
 #if defined(OS_ANDROID)
+
 const DecoderTestData kMediaCodecTests[] = {
     {MEDIA_CODEC, kCodecOpus, "bear-opus.ogg", kBearOpusExpectations, 24, 48000,
      CHANNEL_LAYOUT_STEREO},
@@ -511,7 +512,10 @@
 INSTANTIATE_TEST_CASE_P(MediaCodecAudioDecoderTest,
                         AudioDecoderTest,
                         testing::ValuesIn(kMediaCodecTests));
-#endif  // defined(OS_ANDROID)
+
+#else  // !defined(OS_ANDROID)
+
+// Disable all FFmpeg decoder tests on Android. http://crbug.com/570762.
 
 #if defined(USE_PROPRIETARY_CODECS)
 const DecodedBufferExpectations kSfxMp3Expectations[] = {
@@ -594,4 +598,6 @@
                         FFmpegAudioDecoderBehavioralTest,
                         testing::ValuesIn(kFFmpegBehavioralTest));
 
+#endif  // !defined(OS_ANDROID)
+
 }  // namespace media