Adding platform specific checks for VP9 codecs and HLS mime types

content/browser/media/media_canplaytype_browsertest.cc

Index: content/browser/media/media_canplaytype_browsertest.cc
diff --git a/content/browser/media/media_canplaytype_browsertest.cc b/content/browser/media/media_canplaytype_browsertest.cc
index 398039ab379876a4d37752f3b596e027f12c5595..150e187fe5db57af1dfe8e122ae27f17b2efe3c9 100644
--- a/content/browser/media/media_canplaytype_browsertest.cc
+++ b/content/browser/media/media_canplaytype_browsertest.cc
@@ -9,6 +9,10 @@
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/shell/browser/shell.h"
 
+#if defined(OS_ANDROID)
+#include "base/android/build_info.h"
+#endif
+
 const char* kProbably = "probably";
 const char* kMaybe = "maybe";
 const char* kNot = "";
@@ -28,9 +32,6 @@ const char* kOggVideoProbably = "probably";
 const char* kOggVideoMaybe = "maybe";
 const char* kTheoraProbably = "probably";
 const char* kOpusProbably = "probably";
-const char* kOpusProbablyElseMaybe = "probably";
-const char* kHLSProbably = "";
-const char* kHLSMaybe = "";
 #if defined(USE_PROPRIETARY_CODECS)
 const char* kTheoraAndPropProbably = "probably";
 const char* kOpusAndPropProbably = "probably";
@@ -41,13 +42,10 @@ const char* kOpusAndPropProbably = "";
 #else
 const char* kOggVideoProbably = "";
 const char* kOggVideoMaybe = "";
-const char* kTheoraProbably = "maybe";
+const char* kTheoraProbably = "";
 const char* kOpusProbably = "";
-const char* kOpusProbablyElseMaybe = "maybe";
 const char* kTheoraAndPropProbably = "maybe";
 const char* kOpusAndPropProbably = "maybe";
-const char* kHLSProbably = "probably";
-const char* kHLSMaybe = "maybe";
 #endif  // !OS_ANDROID
 
 namespace content {
@@ -78,9 +76,6 @@ private:
   DISALLOW_COPY_AND_ASSIGN(MediaCanPlayTypeTest);
 };
 
-// TODO(amogh.bihani): http://crbug.com/357665
-#if !defined(OS_ANDROID)
-
 IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_wav) {
   EXPECT_EQ(kMaybe, CanPlay("'audio/wav'"));
   EXPECT_EQ(kProbably, CanPlay("'audio/wav; codecs=\"1\"'"));
@@ -142,6 +137,13 @@ IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_wav) {
 }
 
 IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_webm) {
+  std::string VP9Probably = "probably";
+  std::string VP9AndOpusProbably = "probably";
+#if defined(OS_ANDROID)
+  VP9AndOpusProbably = "";
+  if (base::android::BuildInfo::GetInstance()->sdk_int() < 19)
+    VP9Probably = "";

[xhwang, 2014/04/28 17:48:48]

Is it guaranteed that VP9 is supported on all devices that run Android KK and
later? At least I don't see this in the doc below:
http://developer.android.com/guide/appendix/media-formats.html

[amogh.bihani, 2014/04/29 03:05:08]

VP9 has to be supported in all the KK devices. This is mentioned in the
compatibility definition of Android[1]. (section 5.1 - Media Codecs, last entry
in that table)

https://codereview.chromium.org/66863003 this CL had specifically added check
for VP9 on kitkat.
----------
[1]
http://static.googleusercontent.com/media/source.android.com/en/us/compatibil...

[xhwang, 2014/04/29 17:13:42]

Thanks for the link. Can you add a comment about this?

+#endif
   EXPECT_EQ(kMaybe, CanPlay("'video/webm'"));
 
   EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp8\"'"));
@@ -151,15 +153,16 @@ IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_webm) {
   EXPECT_EQ(kOpusProbably, CanPlay("'video/webm; codecs=\"vp8, opus\"'"));
   EXPECT_EQ(kOpusProbably, CanPlay("'video/webm; codecs=\"vp8.0, opus\"'"));
 
-  EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp9\"'"));
-  EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp9.0\"'"));
-  EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp9, vorbis\"'"));
-  EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp9.0, vorbis\"'"));
-  EXPECT_EQ(kOpusProbably, CanPlay("'video/webm; codecs=\"vp9, opus\"'"));
-  EXPECT_EQ(kOpusProbably, CanPlay("'video/webm; codecs=\"vp9.0, opus\"'"));
+  EXPECT_EQ(VP9Probably, CanPlay("'video/webm; codecs=\"vp9\"'"));
+  EXPECT_EQ(VP9Probably, CanPlay("'video/webm; codecs=\"vp9.0\"'"));
+  EXPECT_EQ(VP9Probably, CanPlay("'video/webm; codecs=\"vp9, vorbis\"'"));
+  EXPECT_EQ(VP9Probably, CanPlay("'video/webm; codecs=\"vp9.0, vorbis\"'"));
+  EXPECT_EQ(VP9AndOpusProbably, CanPlay("'video/webm; codecs=\"vp9, opus\"'"));
+  EXPECT_EQ(VP9AndOpusProbably,
+            CanPlay("'video/webm; codecs=\"vp9.0, opus\"'"));
 
-  EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp8, vp9\"'"));
-  EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp8.0, vp9.0\"'"));
+  EXPECT_EQ(VP9Probably, CanPlay("'video/webm; codecs=\"vp8, vp9\"'"));
+  EXPECT_EQ(VP9Probably, CanPlay("'video/webm; codecs=\"vp8.0, vp9.0\"'"));
   EXPECT_EQ(kNot, CanPlay("'video/webm; codecs=\"vp8, theora\"'"));
   EXPECT_EQ(kNot, CanPlay("'video/webm; codecs=\"vp8, avc1\"'"));
   EXPECT_EQ(kNot, CanPlay("'video/webm; codecs=\"vp9, avc3\"'"));
@@ -274,9 +277,8 @@ IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_ogg) {
 
   EXPECT_EQ(kMaybe, CanPlay("'audio/ogg'"));
   EXPECT_EQ(kProbably, CanPlay("'audio/ogg; codecs=\"vorbis\"'"));
-  EXPECT_EQ(kOpusProbablyElseMaybe, CanPlay("'audio/ogg; codecs=\"opus\"'"));
-  EXPECT_EQ(kOpusProbablyElseMaybe,
-            CanPlay("'audio/ogg; codecs=\"vorbis, opus\"'"));
+  EXPECT_EQ(kOpusProbably, CanPlay("'audio/ogg; codecs=\"opus\"'"));
+  EXPECT_EQ(kOpusProbably, CanPlay("'audio/ogg; codecs=\"vorbis, opus\"'"));
 
   EXPECT_EQ(kNot, CanPlay("'audio/ogg; codecs=\"theora\"'"));
   EXPECT_EQ(kNot, CanPlay("'audio/ogg; codecs=\"theora, vorbis\"'"));
@@ -307,13 +309,12 @@ IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_ogg) {
   EXPECT_EQ(kMaybe, CanPlay("'application/ogg'"));
   EXPECT_EQ(kProbably, CanPlay("'application/ogg; codecs=\"vorbis\"'"));
   EXPECT_EQ(kTheoraProbably, CanPlay("'application/ogg; codecs=\"theora\"'"));
-  EXPECT_EQ(kOpusProbablyElseMaybe,
-            CanPlay("'application/ogg; codecs=\"opus\"'"));
+  EXPECT_EQ(kOpusProbably, CanPlay("'application/ogg; codecs=\"opus\"'"));
   EXPECT_EQ(kTheoraProbably,
             CanPlay("'application/ogg; codecs=\"theora, vorbis\"'"));
   EXPECT_EQ(kTheoraProbably,
             CanPlay("'application/ogg; codecs=\"theora, opus\"'"));
-  EXPECT_EQ(kOpusProbablyElseMaybe,
+  EXPECT_EQ(kOpusProbably,
             CanPlay("'application/ogg; codecs=\"opus, vorbis\"'"));
 
   EXPECT_EQ(kNot, CanPlay("'application/ogg; codecs=\"vp8\"'"));
@@ -498,6 +499,18 @@ IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_mp3) {
 }
 
 IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_mp4) {
+  // TODO(amogh.bihani): Change this expectation when bug 53193 is fixed.
+  std::string PropAndVP9Probably = "";
+#if defined (OS_ANDROID)
+  if (base::android::BuildInfo::GetInstance()->sdk_int() < 19)
+    PropAndVP9Probably = "maybe";

[xhwang, 2014/04/29 17:13:42]

I think I am missing some point. Why this is "maybe" but on line 145,
VP9Probably is "" if sdk < 19? 

[amogh.bihani, 2014/04/30 03:47:32]

That is because webm have been added in the list of strict media mime types[1].
If it finds any codec that is not supported, it returns ""[2].
However, mp4 and HLS are yet to be added in that list. So if they find any
incompatible codec they return a "maybe"[3]. My other CL will fix this[4].
------------
[1]
https://code.google.com/p/chromium/codesearch#chromium/src/net/base/mime_util...

[2]
https://code.google.com/p/chromium/codesearch#chromium/src/content/renderer/r...

[3]
https://code.google.com/p/chromium/codesearch#chromium/src/content/renderer/r...

[4] https://codereview.chromium.org/254983006/

+  else
+    PropAndVP9Probably = "probably";
+#else
+#if defined(USE_PROPRIETARY_CODECS)
+  PropAndVP9Probably = "probably";
+#endif  // USE_PROPRIETARY_CODECS
+#endif  // OS_ANDROID
   EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4'"));
 
   EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1\"'"));
@@ -526,7 +539,7 @@ IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_mp4) {
   EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"mp4a.\"'"));
 
   EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"vp8\"'"));
-  EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"vp9\"'"));
+  EXPECT_EQ(PropAndVP9Probably, CanPlay("'video/mp4; codecs=\"vp9\"'"));
 
   EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"vorbis\"'"));
   EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1, vorbis\"'"));
@@ -607,7 +620,7 @@ IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_mp4) {
   EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"mp4a.\"'"));
 
   EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"vp8\"'"));
-  EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"vp9\"'"));
+  EXPECT_EQ(PropAndVP9Probably, CanPlay("'video/x-m4v; codecs=\"vp9\"'"));
 
   EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"vorbis\"'"));
   EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc1, vorbis\"'"));
@@ -698,8 +711,8 @@ IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_mp4) {
 
   EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"vp8\"'"));
   EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"vp8.0\"'"));
-  EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"vp9\"'"));
-  EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"vp9.0\"'"));
+  EXPECT_EQ(PropAndVP9Probably, CanPlay("'audio/mp4; codecs=\"vp9\"'"));
+  EXPECT_EQ(PropAndVP9Probably, CanPlay("'audio/mp4; codecs=\"vp9.0\"'"));
 
   EXPECT_EQ(kOpusAndPropProbably, CanPlay("'audio/mp4; codecs=\"opus\"'"));
   EXPECT_EQ(kOpusAndPropProbably,
@@ -774,8 +787,8 @@ IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_mp4) {
 
   EXPECT_EQ(kPropProbably, CanPlay("'audio/x-m4a; codecs=\"vp8\"'"));
   EXPECT_EQ(kPropProbably, CanPlay("'audio/x-m4a; codecs=\"vp8.0\"'"));
-  EXPECT_EQ(kPropProbably, CanPlay("'audio/x-m4a; codecs=\"vp9\"'"));
-  EXPECT_EQ(kPropProbably, CanPlay("'audio/x-m4a; codecs=\"vp9.0\"'"));
+  EXPECT_EQ(PropAndVP9Probably, CanPlay("'audio/x-m4a; codecs=\"vp9\"'"));
+  EXPECT_EQ(PropAndVP9Probably, CanPlay("'audio/x-m4a; codecs=\"vp9.0\"'"));
 
   EXPECT_EQ(kOpusAndPropProbably, CanPlay("'audio/x-m4a; codecs=\"opus\"'"));
   EXPECT_EQ(kOpusAndPropProbably,
@@ -820,214 +833,227 @@ IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_mp4) {
 }
 
 IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_HLS) {
-  EXPECT_EQ(kHLSMaybe, CanPlay("'application/x-mpegurl'"));
+  std::string HLSProbably = "";
+  std::string HLSMaybe = "";
+  std::string HLSAndVP9Probably = "";
+#if defined(OS_ANDROID)
+  int sdk = base::android::BuildInfo::GetInstance()->sdk_int();
+  if (sdk > 13) {
+    HLSProbably = "probably";
+    HLSMaybe = "maybe";
+    if (sdk < 19)
+      HLSAndVP9Probably = "maybe";
+    else
+      HLSAndVP9Probably = "probably";
+  }
+#endif
+  EXPECT_EQ(HLSMaybe, CanPlay("'application/x-mpegurl'"));
 
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
             CanPlay("'application/x-mpegurl; codecs=\"avc1\"'"));
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
             CanPlay("'application/x-mpegurl; codecs=\"avc3\"'"));
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
             CanPlay("'application/x-mpegurl; codecs=\"mp4a\"'"));
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
             CanPlay("'application/x-mpegurl; codecs=\"avc1, mp4a\"'"));
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
             CanPlay("'application/x-mpegurl; codecs=\"avc3, mp4a\"'"));
 
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
             CanPlay("'application/x-mpegurl; codecs=\"avc1.4D401E\"'"));
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
             CanPlay("'application/x-mpegurl; codecs=\"avc3.64001F\"'"));
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
             CanPlay("'application/x-mpegurl; codecs=\"mp4a.40.2\"'"));
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
         CanPlay("'application/x-mpegurl; codecs=\"avc1.4D401E, mp4a.40.2\"'"));
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
         CanPlay("'application/x-mpegurl; codecs=\"avc3.64001F, mp4a.40.5\"'"));
 
   // TODO(amogh.bihani): Change these tests when bug 53193 is fixed.
   // http://crbug.com/53193 ----------------------------------------------------
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
             CanPlay("'application/x-mpegurl; codecs=\"avc1.unknown\"'"));
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
             CanPlay("'application/x-mpegurl; codecs=\"avc3.unknown\"'"));
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
             CanPlay("'application/x-mpegurl; codecs=\"mp4a.unknown\"'"));
 
-  EXPECT_EQ(kHLSProbably, CanPlay("'application/x-mpegurl; codecs=\"avc1.\"'"));
-  EXPECT_EQ(kHLSProbably, CanPlay("'application/x-mpegurl; codecs=\"avc3.\"'"));
-  EXPECT_EQ(kHLSProbably, CanPlay("'application/x-mpegurl; codecs=\"mp4a.\"'"));
+  EXPECT_EQ(HLSProbably, CanPlay("'application/x-mpegurl; codecs=\"avc1.\"'"));
+  EXPECT_EQ(HLSProbably, CanPlay("'application/x-mpegurl; codecs=\"avc3.\"'"));
+  EXPECT_EQ(HLSProbably, CanPlay("'application/x-mpegurl; codecs=\"mp4a.\"'"));
 
-  EXPECT_EQ(kHLSProbably, CanPlay("'application/x-mpegurl; codecs=\"vp8\"'"));
-  EXPECT_EQ(kHLSProbably, CanPlay("'application/x-mpegurl; codecs=\"vp9\"'"));
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably, CanPlay("'application/x-mpegurl; codecs=\"vp8\"'"));
+  EXPECT_EQ(HLSAndVP9Probably,
+            CanPlay("'application/x-mpegurl; codecs=\"vp9\"'"));
+  EXPECT_EQ(HLSProbably,
             CanPlay("'application/x-mpegurl; codecs=\"vorbis\"'"));
 
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
             CanPlay("'application/x-mpegurl; codecs=\"avc1, vorbis\"'"));
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
             CanPlay("'application/x-mpegurl; codecs=\"avc3, vorbis\"'"));
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
             CanPlay("'application/x-mpegurl; codecs=\"avc1.4D401E, vorbis\"'"));
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
             CanPlay("'application/x-mpegurl; codecs=\"avc3.64001F, vorbis\"'"));
 
-  EXPECT_EQ(kHLSMaybe, CanPlay("'application/x-mpegurl; codecs=\"opus\"'"));
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe, CanPlay("'application/x-mpegurl; codecs=\"opus\"'"));
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/x-mpegurl; codecs=\"vp8, opus\"'"));
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/x-mpegurl; codecs=\"vp9, opus\"'"));
 
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/x-mpegurl; codecs=\"theora\"'"));
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/x-mpegurl; codecs=\"theora, vorbis\"'"));
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/x-mpegurl; codecs=\"theora, mp4a\"'"));
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/x-mpegurl; codecs=\"theora, mp4a.40.2\"'"));
 
-  EXPECT_EQ(kHLSMaybe, CanPlay("'application/x-mpegurl; codecs=\"AVC1\"'"));
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe, CanPlay("'application/x-mpegurl; codecs=\"AVC1\"'"));
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/x-mpegurl; codecs=\"AVC1.4d401e\"'"));
-  EXPECT_EQ(kHLSMaybe, CanPlay("'application/x-mpegurl; codecs=\"AVC3\"'"));
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe, CanPlay("'application/x-mpegurl; codecs=\"AVC3\"'"));
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/x-mpegurl; codecs=\"AVC3.64001f\"'"));
-  EXPECT_EQ(kHLSMaybe, CanPlay("'application/x-mpegurl; codecs=\"MP4A\"'"));
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe, CanPlay("'application/x-mpegurl; codecs=\"MP4A\"'"));
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/x-mpegurl; codecs=\"MP4A.40.2\"'"));
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/x-mpegurl; codecs=\"AVC1, MP4\"'"));
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/x-mpegurl; codecs=\"AVC3, MP4\"'"));
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
         CanPlay("'application/x-mpegurl; codecs=\", AVC1.4D401E, MP4.40.2\"'"));
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
         CanPlay("'application/x-mpegurl; codecs=\", AVC3.64001F, MP4.40.2\"'"));
 
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/x-mpegurl; codecs=\"avc2\"'"));
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/x-mpegurl; codecs=\"avc4\"'"));
 
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/x-mpegurl; codecs=\"avc1x\"'"));
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/x-mpegurl; codecs=\"avc3x\"'"));
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/x-mpegurl; codecs=\"mp4ax\"'"));
 
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/x-mpegurl; codecs=\"unknown\"'"));
   // ---------------------------------------------------------------------------
 
-  EXPECT_EQ(kHLSMaybe, CanPlay("'application/vnd.apple.mpegurl'"));
+  EXPECT_EQ(HLSMaybe, CanPlay("'application/vnd.apple.mpegurl'"));
 
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
             CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1\"'"));
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
             CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3\"'"));
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
             CanPlay("'application/vnd.apple.mpegurl; codecs=\"mp4a\"'"));
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
             CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1, mp4a\"'"));
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
             CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3, mp4a\"'"));
 
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
             CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1.4D401E\"'"));
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
             CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3.64001F\"'"));
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
             CanPlay("'application/vnd.apple.mpegurl; codecs=\"mp4a.40.2\"'"));
 
   // TODO(amogh.bihani): Change these tests when bug 53193 is fixed.
   // http://crbug.com/53193 ----------------------------------------------------
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
           CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1.unknown\"'"));
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
           CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3.unknown\"'"));
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
           CanPlay("'application/vnd.apple.mpegurl; codecs=\"mp4a.unknown\"'"));
 
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
           CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1.\"'"));
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
           CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3.\"'"));
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
           CanPlay("'application/vnd.apple.mpegurl; codecs=\"mp4a.\"'"));
 
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
             CanPlay("'application/vnd.apple.mpegurl; codecs=\"vp8\"'"));
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSAndVP9Probably,
             CanPlay("'application/vnd.apple.mpegurl; codecs=\"vp9\"'"));
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
             CanPlay("'application/vnd.apple.mpegurl; codecs=\"vorbis\"'"));
 
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
            CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1, vorbis\"'"));
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
            CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3, vorbis\"'"));
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
     CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1.4D401E, vorbis\"'"));
-  EXPECT_EQ(kHLSProbably,
+  EXPECT_EQ(HLSProbably,
     CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3.64001F, vorbis\"'"));
 
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/vnd.apple.mpegurl; codecs=\"opus\"'"));
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/vnd.apple.mpegurl; codecs=\"vp8, opus\"'"));
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/vnd.apple.mpegurl; codecs=\"vp9, opus\"'"));
 
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/vnd.apple.mpegurl; codecs=\"theora\"'"));
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
         CanPlay("'application/vnd.apple.mpegurl; codecs=\"theora, vorbis\"'"));
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
           CanPlay("'application/vnd.apple.mpegurl; codecs=\"theora, mp4a\"'"));
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
       CanPlay("'application/vnd.apple.mpegurl; codecs=\"theora, mp4a.40.2\"'"));
 
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/vnd.apple.mpegurl; codecs=\"AVC1\"'"));
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/vnd.apple.mpegurl; codecs=\"AVC1.4d401e\"'"));
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/vnd.apple.mpegurl; codecs=\"AVC3\"'"));
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/vnd.apple.mpegurl; codecs=\"AVC3.64001f\"'"));
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/vnd.apple.mpegurl; codecs=\"MP4A\"'"));
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/vnd.apple.mpegurl; codecs=\"MP4A.40.2\"'"));
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/vnd.apple.mpegurl; codecs=\"AVC1, MP4\"'"));
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/vnd.apple.mpegurl; codecs=\"AVC3, MP4\"'"));
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/vnd.apple.mpegurl; "
                     "codecs=\", AVC1.4D401E, MP4.40.2\"'"));
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/vnd.apple.mpegurl; "
                     "codecs=\", AVC3.64001F, MP4.40.2\"'"));
 
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc2\"'"));
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc4\"'"));
 
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1x\"'"));
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3x\"'"));
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/vnd.apple.mpegurl; codecs=\"mp4ax\"'"));
 
-  EXPECT_EQ(kHLSMaybe,
+  EXPECT_EQ(HLSMaybe,
             CanPlay("'application/vnd.apple.mpegurl; codecs=\"unknown\"'"));
   // ---------------------------------------------------------------------------
 }
 
-#endif  // !OS_ANDROID
-
 }  // namespace content