Fix PlatformInfo variation for mime util IsCodecSupportedOnAndroidTest

media/base/mime_util_unittest.cc

 // Copyright 2015 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 "base/macros.h"
 #include "base/strings/string_split.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/scoped_command_line.h"
@@ skipping 46 matching lines @@
 
   // Stuff states to test into vectors for easy for_each() iteration.
   MAKE_TEST_VECTOR(has_platform_decoders);
   MAKE_TEST_VECTOR(has_platform_vp8_decoder);
   MAKE_TEST_VECTOR(has_platform_vp9_decoder);
   MAKE_TEST_VECTOR(supports_opus);
 #undef MAKE_TEST_VECTOR
 
   MimeUtil::PlatformInfo info;
 
-#define RUN_TEST_VECTOR(name)                   \
-  size_t name##_index = 0;                      \
-  for (info.name = name##_states[name##_index]; \
-       name##_index < name##_states.size(); ++name##_index)
+#define RUN_TEST_VECTOR_BEGIN(name)             \
+  for (size_t name##_index = 0;                 \
+       name##_index < name##_states.size();     \
+       ++name##_index) {                        \
+    info.name = name##_states[name##_index];
+#define RUN_TEST_VECTOR_END() }
 
-  RUN_TEST_VECTOR(has_platform_decoders) {
-    RUN_TEST_VECTOR(has_platform_vp8_decoder) {
-      RUN_TEST_VECTOR(has_platform_vp9_decoder) {
-        RUN_TEST_VECTOR(supports_opus) {
+  RUN_TEST_VECTOR_BEGIN(has_platform_decoders)
+    RUN_TEST_VECTOR_BEGIN(has_platform_vp8_decoder)
+      RUN_TEST_VECTOR_BEGIN(has_platform_vp9_decoder)
+        RUN_TEST_VECTOR_BEGIN(supports_opus)
           for (int codec = MimeUtil::INVALID_CODEC;
                codec <= MimeUtil::LAST_CODEC; ++codec) {
             SCOPED_TRACE(base::StringPrintf(
                 "has_platform_decoders=%d, has_platform_vp8_decoder=%d, "
                 "supports_opus=%d, "
                 "has_platform_vp9_decoder=%d, "
                 "codec=%d",
                 info.has_platform_decoders, info.has_platform_vp8_decoder,
                 info.supports_opus, info.has_platform_vp9_decoder, codec));
             test_func(info, static_cast<MimeUtil::Codec>(codec));
           }
-        }
-      }
-    }
-  }
-#undef RUN_TEST_VECTOR
+        RUN_TEST_VECTOR_END()
+      RUN_TEST_VECTOR_END()
+    RUN_TEST_VECTOR_END()
+  RUN_TEST_VECTOR_END()
+#undef RUN_TEST_VECTOR_BEGIN

[DaleCurtis, 2017/04/11 19:04:45]

Blank line above.

[pavor, 2017/04/12 07:03:50]

Done

+#undef RUN_TEST_VECTOR_END
 }
 
 // Helper method for generating the |states_to_vary| value used by
 // RunPlatformCodecTest(). Marks all fields to be varied.
 static MimeUtil::PlatformInfo VaryAllFields() {
   MimeUtil::PlatformInfo states_to_vary;
   states_to_vary.has_platform_vp8_decoder = true;
   states_to_vary.has_platform_vp9_decoder = true;
   states_to_vary.supports_opus = true;
   states_to_vary.has_platform_decoders = true;
@@ skipping 224 matching lines @@
           // These codecs are never supported by the Android platform.
           case MimeUtil::INVALID_CODEC:
           case MimeUtil::AC3:
           case MimeUtil::EAC3:
           case MimeUtil::THEORA:
             EXPECT_FALSE(result);
             break;
 
           // These codecs are always supported with the unified pipeline.
           case MimeUtil::FLAC:
+          case MimeUtil::H264:
           case MimeUtil::PCM:
           case MimeUtil::MPEG2_AAC:
           case MimeUtil::MP3:
           case MimeUtil::MPEG4_AAC:
           case MimeUtil::OPUS:
           case MimeUtil::VORBIS:
           case MimeUtil::VP8:
           case MimeUtil::VP9:
             EXPECT_TRUE(result);
             break;
 
           // These codecs are only supported if platform decoders are supported.
-          case MimeUtil::H264:
-            EXPECT_EQ(info.has_platform_decoders, result);
-            break;
-
           case MimeUtil::HEVC:
             EXPECT_EQ(HasHevcSupport() && info.has_platform_decoders, result);
             break;
 
           case MimeUtil::DOLBY_VISION:
             EXPECT_EQ(HasDolbyVisionSupport(), result);
             break;
         }
       });
 }
@@ skipping 25 matching lines @@
             MimeUtil::MPEG2_AAC, "application/vnd.apple.mpegurl", false, info));
         EXPECT_FALSE(MimeUtil::IsCodecSupportedOnAndroid(
             MimeUtil::MPEG2_AAC, "audio/mpegurl", false, info));
         EXPECT_FALSE(MimeUtil::IsCodecSupportedOnAndroid(
             MimeUtil::MPEG2_AAC, "audio/x-mpegurl", false, info));
       });
 }
 
 }  // namespace internal
 }  // namespace media