Moved media mime type and codec checks to media/base/mime_util.*

media/blink/key_system_config_selector.cc

Index: media/blink/key_system_config_selector.cc
diff --git a/media/blink/key_system_config_selector.cc b/media/blink/key_system_config_selector.cc
index f34bd8fc463cfb00ea9d5b3a1029653ae34805af..c88a5b23f9522323305f3718a8f6b1fe7f001d5a 100644
--- a/media/blink/key_system_config_selector.cc
+++ b/media/blink/key_system_config_selector.cc
@@ -8,10 +8,11 @@
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"

[Ryan Sleevi, 2015/05/13 23:55:53]

Unclear why this is added? no ifdefs?

[servolk, 2015/05/14 00:13:23]

There was a comment by ddorwin@ in patchset #9 to add build_config.h here
(https://codereview.chromium.org/1129643002/diff/200001/media/blink/key_system...)
since this file used to have a few OS_ANDROID references, so I've added this.
Then a recent CL https://codereview.chromium.org/1124863005 removed all
OS_ANDROID from this file. I have rebased my patch and haven't noticed that this
file no longer need build_config.h. Removed.

 #include "media/base/key_systems.h"
 #include "media/base/media_permission.h"
+#include "media/base/mime_util.h"
 #include "media/blink/webmediaplayer_util.h"
-#include "net/base/mime_util.h"
 #include "third_party/WebKit/public/platform/WebMediaKeySystemConfiguration.h"
 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
 #include "third_party/WebKit/public/platform/WebString.h"
@@ -283,7 +284,7 @@ bool KeySystemConfigSelector::IsSupportedContentType(
   std::string container_lower = base::StringToLowerASCII(container_mime_type);
 
   // Check that |container_mime_type| is supported by Chrome.
-  if (!net::IsSupportedMediaMimeType(container_lower))
+  if (!media::IsSupportedMediaMimeType(container_lower))
     return false;
 
   // Check that |codecs| are supported by Chrome. This is done primarily to
@@ -291,10 +292,10 @@ bool KeySystemConfigSelector::IsSupportedContentType(
   // codecs that Chrome does not (which could complicate the robustness
   // algorithm).
   std::vector<std::string> codec_vector;
-  net::ParseCodecString(codecs, &codec_vector, false);
+  media::ParseCodecString(codecs, &codec_vector, false);
   if (!codec_vector.empty() &&
-      (net::IsSupportedStrictMediaMimeType(container_lower, codec_vector) !=
-       net::IsSupported)) {
+      (media::IsSupportedStrictMediaMimeType(container_lower, codec_vector) !=
+       media::IsSupported)) {
     return false;
   }
 
@@ -302,7 +303,7 @@ bool KeySystemConfigSelector::IsSupportedContentType(
   // This check does not handle extended codecs, so extended codec information
   // is stripped (extended codec information was checked above).
   std::vector<std::string> stripped_codec_vector;
-  net::ParseCodecString(codecs, &stripped_codec_vector, true);
+  media::ParseCodecString(codecs, &stripped_codec_vector, true);
   EmeConfigRule codecs_rule = key_systems_->GetContentTypeConfigRule(
       key_system, media_type, container_lower, stripped_codec_vector);
   if (!config_state->IsRuleSupported(codecs_rule))