| 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(
|
|
|