Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(333)

Unified Diff: media/blink/webencryptedmediaclient_impl.cc

Issue 877323009: Extracted media mime type checks from net/base/ into media/base/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Build fixes #1 Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/blink/webencryptedmediaclient_impl.cc
diff --git a/media/blink/webencryptedmediaclient_impl.cc b/media/blink/webencryptedmediaclient_impl.cc
index 2dd051e59626ee9d47fcfd33c11c63a74c23dd3c..84b59a287c6d59ef3cc42841a0a5327794634a13 100644
--- a/media/blink/webencryptedmediaclient_impl.cc
+++ b/media/blink/webencryptedmediaclient_impl.cc
@@ -11,9 +11,9 @@
#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/webcontentdecryptionmodule_impl.h"
#include "media/blink/webcontentdecryptionmoduleaccess_impl.h"
-#include "net/base/mime_util.h"
#include "third_party/WebKit/public/platform/WebEncryptedMediaRequest.h"
#include "third_party/WebKit/public/platform/WebMediaKeySystemConfiguration.h"
#include "third_party/WebKit/public/platform/WebString.h"
@@ -51,7 +51,7 @@ static bool IsSupportedContentType(const std::string& key_system,
// TODO(sandersd): Reject codecs that do not match the media type.
// http://crbug.com/457386
std::vector<std::string> codec_vector;
- net::ParseCodecString(codecs, &codec_vector, true);
+ media::ParseCodecString(codecs, &codec_vector, true);
if (!IsSupportedKeySystemWithMediaMimeType(container, codec_vector,
key_system)) {
return false;
@@ -64,8 +64,8 @@ static bool IsSupportedContentType(const std::string& key_system,
// decode is required).
// TODO(sandersd): Reject ambiguous codecs. http://crbug.com/374751
codec_vector.clear();
- net::ParseCodecString(codecs, &codec_vector, false);
- return net::AreSupportedMediaCodecs(codec_vector);
+ media::ParseCodecString(codecs, &codec_vector, false);
+ return media::AreSupportedMediaCodecs(codec_vector);
}
static bool GetSupportedCapabilities(
« no previous file with comments | « media/base/mime_util_unittest.cc ('k') | media/media.gyp » ('j') | net/base/mime_util.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698