[Chromecast] Cleanup in media_codec_support.*

Replaced outdated dependency on net/base/mime_util.h, now we are using
media/base/mime_util.h instead. Also updated AC3/EAC3 codec ids in
chromecast::media::IsCodecSupported and removed outdated checks for
codec ids supported by mainstream Chrome.

Review URL: https://codereview.chromium.org/1827213002

Cr-Commit-Position: refs/heads/master@{#383215}

3 files changed, 11 insertions, 26 deletions

diff --git a/chromecast/media/base/BUILD.gn b/chromecast/media/base/BUILD.gn
index 48a9253..21d5cf3 100644
--- a/chromecast/media/base/BUILD.gn
+++ b/chromecast/media/base/BUILD.gn
@@ -67,7 +67,7 @@ source_set("base") {
     "//chromecast/base",
     "//crypto",
     "//crypto:platform",
-    "//net",
+    "//media",
   ]
 
   if (chromecast_branding == "public") {
diff --git a/chromecast/media/base/media_codec_support.cc b/chromecast/media/base/media_codec_support.cc
index 56c5faf..b4d237b 100644
--- a/chromecast/media/base/media_codec_support.cc
+++ b/chromecast/media/base/media_codec_support.cc
@@ -8,7 +8,6 @@
 #include "base/strings/string_util.h"
 #include "chromecast/media/base/media_caps.h"
 #include "chromecast/public/media_codec_support_shlib.h"
-#include "net/base/mime_util.h"
 
 namespace chromecast {
 namespace media {
@@ -30,33 +29,19 @@ bool IsCodecSupported(const std::string& codec) {
   if (codec == "aac51") {
     return ::media::HdmiSinkSupportsPcmSurroundSound();
   }
-  if (codec == "ac-3" || codec == "mp4a.a5") {
+  if (codec == "ac-3" || codec == "mp4a.a5" || codec == "mp4a.A5") {
     return ::media::HdmiSinkSupportsAC3();
   }
-  if (codec == "ec-3" || codec == "mp4a.a6") {
+  if (codec == "ec-3" || codec == "mp4a.a6" || codec == "mp4a.A6") {
     return ::media::HdmiSinkSupportsEAC3();
   }
 
-  // TODO(erickung): This is the temporary solution to allow cast working
-  // properly when checking default codec type is supported on not. The change
-  // should be reverted once the function is able to call chrome media function
-  // directly.
-  if (codec == "1" /*PCM*/ || codec == "vorbis" || codec == "opus" ||
-      codec == "theora" || codec == "vp8" || codec == "vp8.0" ||
-      codec == "vp9" || codec == "vp9.0")
-    return true;
-
-  if (codec == "mp3" || codec == "mp4a.66" || codec == "mp4a.67" ||
-      codec == "mp4a.68" || codec == "mp4a.69" || codec == "mp4a.6B" ||
-      codec == "mp4a.40.2" || codec == "mp4a.40.02" || codec == "mp4a.40.29" ||
-      codec == "mp4a.40.5" || codec == "mp4a.40.05" || codec == "mp4a.40")
-    return true;
-
-  if (base::StartsWith(codec, "avc1", base::CompareCase::SENSITIVE) ||
-      base::StartsWith(codec, "avc3", base::CompareCase::SENSITIVE))
-    return true;
-
-  return false;
+  // This function is invoked from MimeUtil::AreSupportedCodecs to check if a
+  // given codec id is supported by Chromecast or not. So by default we should
+  // return true by default to indicate we have no reasons to believe this codec
+  // is unsupported. This will allow the rest of MimeUtil checks to proceed as
+  // usual.
+  return true;
 }
 
 }  // namespace
diff --git a/chromecast/media/base/media_codec_support.h b/chromecast/media/base/media_codec_support.h
index 7681128..1971ddd 100644
--- a/chromecast/media/base/media_codec_support.h
+++ b/chromecast/media/base/media_codec_support.h
@@ -8,9 +8,9 @@
 #include <string>
 
 #include "base/callback.h"
-#include "net/base/mime_util.h"
+#include "media/base/mime_util.h"
 
-// TODO(slan|servolk): remove when this definition exists upstream.
+// TODO(slan|servolk): remove when this definition exists in //media.
 namespace media {
 typedef base::Callback<bool(const std::string&)> IsCodecSupportedCB;
 }