Cleanup unit tests for HLS mime types on Android

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 "base/basictypes.h"
 #include "base/strings/string_split.h"
 #include "media/base/mime_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#if defined(OS_ANDROID)
-#include "base/android/build_info.h"
-#endif
-
 namespace media {
 
-TEST(MimeUtilTest, LookupTypes) {
-#if defined(OS_ANDROID)
-  EXPECT_TRUE(IsSupportedMediaMimeType("application/vnd.apple.mpegurl"));
-  EXPECT_TRUE(IsSupportedMediaMimeType("application/x-mpegurl"));
-  EXPECT_TRUE(IsSupportedMediaMimeType("Application/X-MPEGURL"));
-#endif
-}
-
 TEST(MimeUtilTest, StrictMediaMimeType) {
   EXPECT_TRUE(IsStrictMediaMimeType("video/webm"));
   EXPECT_TRUE(IsStrictMediaMimeType("Video/WEBM"));
   EXPECT_TRUE(IsStrictMediaMimeType("audio/webm"));
 
   EXPECT_TRUE(IsStrictMediaMimeType("audio/wav"));
   EXPECT_TRUE(IsStrictMediaMimeType("audio/x-wav"));
 
   EXPECT_TRUE(IsStrictMediaMimeType("video/ogg"));
   EXPECT_TRUE(IsStrictMediaMimeType("audio/ogg"));
@@ skipping 12 matching lines @@
   EXPECT_TRUE(IsStrictMediaMimeType("application/vnd.apple.mpegurl"));
 
   EXPECT_FALSE(IsStrictMediaMimeType("video/unknown"));
   EXPECT_FALSE(IsStrictMediaMimeType("Video/UNKNOWN"));
   EXPECT_FALSE(IsStrictMediaMimeType("audio/unknown"));
   EXPECT_FALSE(IsStrictMediaMimeType("application/unknown"));
   EXPECT_FALSE(IsStrictMediaMimeType("unknown/unknown"));
 }
 
 TEST(MimeUtilTest, CommonMediaMimeType) {
-#if defined(OS_ANDROID)
-  bool HLSSupported;
-  if (base::android::BuildInfo::GetInstance()->sdk_int() < 14)
-    HLSSupported = false;
-  else
-    HLSSupported = true;
-#endif
-
   EXPECT_TRUE(IsSupportedMediaMimeType("audio/webm"));
   EXPECT_TRUE(IsSupportedMediaMimeType("video/webm"));
 
   EXPECT_TRUE(IsSupportedMediaMimeType("audio/wav"));
   EXPECT_TRUE(IsSupportedMediaMimeType("audio/x-wav"));
 
   EXPECT_TRUE(IsSupportedMediaMimeType("audio/ogg"));
   EXPECT_TRUE(IsSupportedMediaMimeType("application/ogg"));
 #if defined(OS_ANDROID)
   EXPECT_FALSE(IsSupportedMediaMimeType("video/ogg"));
-  EXPECT_EQ(HLSSupported, IsSupportedMediaMimeType("application/x-mpegurl"));
-  EXPECT_EQ(HLSSupported,
-            IsSupportedMediaMimeType("application/vnd.apple.mpegurl"));
+
+  // HLS is supported on Android API level 14 and higher and Chrome supports
+  // API levels 15 and higher, so these are expected to be supported.
+  EXPECT_TRUE(IsSupportedMediaMimeType("application/x-mpegurl"));

[ddorwin, 2015/05/06 20:00:20]

alternatively, you could do this:
  bool kHlsSupported = true;
#else
  bool kHlsSupported = false;
#endif

EXPECT_EQ(kHlsSupported, ...)

This ensures equal coverage, no typos in one test vs. the other, etc.

[servolk, 2015/05/06 20:32:22]

Wait, but that would be the same code as before? I'm removing the API level
check and simplifying tests as suggested by rsleevi@ at
https://codereview.chromium.org/1129643002/diff/80001/media/base/mime_util_un....
Chromium now doesn't support Android API levels lower than 15 or 16, so there's
no need for this conditional check, we can just assume HLS is going to be
supported.

[Ryan Sleevi, 2015/05/06 21:40:02]

No it wouldn't

bool hls_supported = false;
#if defined(OS_ANDROID)
hls_supported = true;
#endif

EXPECT_EQ(hls_supported, IsSupportedMediaMimeType(...));

This ensures that you don't have copy-pasta issues between lines 57/59 and lines
62/63. There's no API level check involved.

+  EXPECT_TRUE(IsSupportedMediaMimeType("Application/X-MPEGURL"));
+  EXPECT_TRUE(IsSupportedMediaMimeType("application/vnd.apple.mpegurl"));
 #else
   EXPECT_TRUE(IsSupportedMediaMimeType("video/ogg"));
   EXPECT_FALSE(IsSupportedMediaMimeType("application/x-mpegurl"));
   EXPECT_FALSE(IsSupportedMediaMimeType("application/vnd.apple.mpegurl"));
 #endif  // OS_ANDROID
 
 #if defined(USE_PROPRIETARY_CODECS)
   EXPECT_TRUE(IsSupportedMediaMimeType("audio/mp4"));
   EXPECT_TRUE(IsSupportedMediaMimeType("audio/x-m4a"));
   EXPECT_TRUE(IsSupportedMediaMimeType("video/mp4"));
@@ skipping 57 matching lines @@
 
   // Test without stripping the codec type.
   std::vector<std::string> codecs_out;
   ParseCodecString("avc1.42E01E, mp4a.40.2", &codecs_out, false);
   ASSERT_EQ(2u, codecs_out.size());
   EXPECT_EQ("avc1.42E01E", codecs_out[0]);
   EXPECT_EQ("mp4a.40.2", codecs_out[1]);
 }
 
 }  // namespace media