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 f9f98bff1cd687e864aa2a10cdf1129d9a7c3712..a7e664f5824e2c947b0cb91da70636231928aebd 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";

[xhwang, 2014/04/10 23:35:56]

These (l.16-l.60) should all be "using const char kFoo[]". See comments below.

 const char* kMaybe = "maybe";
 const char* kNot = "";
@@ -23,6 +27,8 @@ const char* kPropMaybe = "";
 const char* kPropProbablyElseMaybe = "maybe";
 #endif  // USE_PROPRIETARY_CODECS
 
+const char* kVP9Probably = "probably";
+
 // TODO(amogh.bihani): Change the opus tests when opus is  on
 // Android. (http://crbug.com/318436).
 #if !defined(OS_ANDROID)
@@ -33,6 +39,7 @@ const char* kOpusProbably = "probably";
 const char* kOpusProbablyElseMaybe = "probably";
 const char* kHLSProbably = "";
 const char* kHLSMaybe = "";
+const char* kVP9AndOpusProbably = "probably";
 #if defined(USE_PROPRIETARY_CODECS)
 const char* kTheoraAndPropProbably = "probably";
 const char* kOpusAndPropProbably = "probably";
@@ -50,13 +57,29 @@ const char* kTheoraAndPropProbably = "maybe";
 const char* kOpusAndPropProbably = "maybe";
 const char* kHLSProbably = "probably";
 const char* kHLSMaybe = "maybe";
+const char* kVP9AndOpusProbably = "";
 #endif  // !OS_ANDROID
 
 namespace content {
 
+#if defined(OS_ANDROID)
+static void PlatformConfig() {
+  if (base::android::BuildInfo::GetInstance()->sdk_int() < 14) {
+    kHLSProbably = "";
+    kHLSMaybe = "";
+  }
+  if (base::android::BuildInfo::GetInstance()->sdk_int() < 19)
+    kVP9Probably = "";

[xhwang, 2014/04/10 23:35:56]

kFoo means it's a const value; changing the pointer is a bit hacky. We are not
using "const char* const kFoo" a lot because that looks crazy. Actually in
chromium, we prefer using "const char kFoo[]" to "const char*" to prevent this
:)

Instead of doing this, is it possible to have some class/function local
expectation variables which can be different on different platforms?

[amogh.bihani, 2014/04/11 10:43:18]

Oh Ok!
I'll change the type and create local function to handle the expectations.

+}
+#endif  // OS_ANDROID
+
 class MediaCanPlayTypeTest : public MediaBrowserTest {
 public:
-  MediaCanPlayTypeTest() : url_("about:blank") { }
+  MediaCanPlayTypeTest() : url_("about:blank") {
+#if defined(OS_ANDROID)
+    PlatformConfig();
+#endif  // OS_ANDROID
+  }
 
   virtual void SetUpOnMainThread() OVERRIDE {
     NavigateToURL(shell(), url_);
@@ -153,15 +176,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(kVP9Probably, CanPlay("'video/webm; codecs=\"vp9\"'"));
+  EXPECT_EQ(kVP9Probably, CanPlay("'video/webm; codecs=\"vp9.0\"'"));
+  EXPECT_EQ(kVP9Probably, CanPlay("'video/webm; codecs=\"vp9, vorbis\"'"));
+  EXPECT_EQ(kVP9Probably, CanPlay("'video/webm; codecs=\"vp9.0, vorbis\"'"));
+  EXPECT_EQ(kVP9AndOpusProbably, CanPlay("'video/webm; codecs=\"vp9, opus\"'"));
+  EXPECT_EQ(kVP9AndOpusProbably,
+            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(kVP9Probably, CanPlay("'video/webm; codecs=\"vp8, vp9\"'"));
+  EXPECT_EQ(kVP9Probably, 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\"'"));