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

media/blink/key_system_config_selector.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "key_system_config_selector.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #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"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "url/gurl.h"
 
 namespace media {
 
 using EmeFeatureRequirement =
     blink::WebMediaKeySystemConfiguration::Requirement;
@@ skipping 233 matching lines @@
     const std::string& container_mime_type,
     const std::string& codecs) {
   // TODO(sandersd): Move contentType parsing from Blink to here so that invalid
   // parameters can be rejected. http://crbug.com/417561
   std::string container_lower = base::StringToLowerASCII(container_mime_type);
 
   // Check that |container_mime_type| and |codecs| are supported by the CDM.
   // This check does not handle extended codecs, so extended codec information
   // is stripped.
   std::vector<std::string> codec_vector;
-  net::ParseCodecString(codecs, &codec_vector, true);
+  media::ParseCodecString(codecs, &codec_vector, true);
   if (!key_systems_->IsSupportedCodecCombination(
           key_system, media_type, container_lower, codec_vector)) {
     return false;
   }
 
   // Check that |container_mime_type| is supported by Chrome. This can only
   // happen if the CDM declares support for a container that Chrome does not.
-  if (!net::IsSupportedMediaMimeType(container_lower)) {
+  if (!media::IsSupportedMediaMimeType(container_lower)) {
     NOTREACHED();
     return false;
   }
 
   // Check that |codecs| are supported by Chrome. This is done primarily to
   // validate extended codecs, but it also ensures that the CDM cannot support
   // codecs that Chrome does not (which could complicate the robustness
   // algorithm).
   if (codec_vector.empty())
     return true;
   codec_vector.clear();
-  net::ParseCodecString(codecs, &codec_vector, false);
-  return (net::IsSupportedStrictMediaMimeType(container_lower, codec_vector) ==
-          net::IsSupported);
+  media::ParseCodecString(codecs, &codec_vector, false);
+  return (media::IsSupportedStrictMediaMimeType(container_lower, codec_vector)
+          == media::IsSupported);

[Ryan Sleevi, 2015/05/06 00:59:13]

is this git cl formatted?

[servolk, 2015/05/06 01:13:39]

No, for some reason it's broken on my machine, and I have no idea why:
servolk@servolk:/media/ssd850/chromium/src$ git cl format
Traceback (most recent call last):
  File
"/media/ssd850/chromium/src/buildtools/clang_format/script/clang-format-diff.py",
line 120, in <module>
    main()
  File
"/media/ssd850/chromium/src/buildtools/clang_format/script/clang-format-diff.py",
line 103, in main
    stderr=None, stdin=subprocess.PIPE)
  File "/usr/lib/python2.7/subprocess.py", line 710, in __init__
    errread, errwrite)
  File "/usr/lib/python2.7/subprocess.py", line 1327, in _execute_child
    raise child_exception
OSError: [Errno 13] Permission denied
Command "/usr/bin/python
/media/ssd850/chromium/src/buildtools/clang_format/script/clang-format-diff.py
-p0 -i" failed.

 }
 
 bool KeySystemConfigSelector::GetSupportedCapabilities(
     const std::string& key_system,
     EmeMediaType media_type,
     const blink::WebVector<blink::WebMediaKeySystemMediaCapability>&
         requested_media_capabilities,
     KeySystemConfigSelector::ConfigState* config_state,
     std::vector<blink::WebMediaKeySystemMediaCapability>*
         supported_media_capabilities) {
@@ skipping 427 matching lines @@
 
 void KeySystemConfigSelector::OnPermissionResult(
     scoped_ptr<SelectionRequest> request,
     bool is_permission_granted) {
   request->was_permission_requested = true;
   request->is_permission_granted = is_permission_granted;
   SelectConfigInternal(request.Pass());
 }
 
 }  // namespace media