Merge 283929 "Fix canPlayType() support for non-RFC compliant mp..."

content/browser/media/media_canplaytype_browsertest.cc

Index: content/browser/media/media_canplaytype_browsertest.cc
===================================================================
--- content/browser/media/media_canplaytype_browsertest.cc	(revision 287334)
+++ content/browser/media/media_canplaytype_browsertest.cc	(working copy)
@@ -356,9 +356,13 @@
   EXPECT_EQ(kNot, CanPlay("'video/mpeg'"));
   EXPECT_EQ(kNot, CanPlay("'video/x-mp3'"));
 
-  // audio/mpeg does not allow any codecs parameter
+  // audio/mpeg without a codecs parameter (RFC 3003 compliant)
   EXPECT_EQ(kPropProbably, CanPlay("'audio/mpeg'"));
 
+  // audio/mpeg with mp3 in codecs parameter. (Not RFC compliant, but
+  // very common in the wild so it is a defacto standard).
+  EXPECT_EQ(kPropProbably, CanPlay("'audio/mpeg; codecs=\"mp3\"'"));
+
   EXPECT_EQ(kNot, CanPlay("'audio/mpeg; codecs=\"avc1\"'"));
   EXPECT_EQ(kNot, CanPlay("'audio/mpeg; codecs=\"avc3\"'"));