Index: third_party/WebKit/Source/modules/encryptedmedia/MediaKeySystemAccess.cpp |
diff --git a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySystemAccess.cpp b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySystemAccess.cpp |
index 9485c918accd263c9a1e48f6fae6256c0309f270..3c9dd43ae896c0be2e9522800e4384d9dbee21ae 100644 |
--- a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySystemAccess.cpp |
+++ b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySystemAccess.cpp |
@@ -18,6 +18,8 @@ |
#include "public/platform/WebContentDecryptionModule.h" |
#include "public/platform/WebEncryptedMediaTypes.h" |
#include "public/platform/WebMediaKeySystemConfiguration.h" |
+#include "wtf/PtrUtil.h" |
+#include <memory> |
namespace blink { |
@@ -48,7 +50,7 @@ public: |
{ |
// NOTE: Continued from step 2.8 of createMediaKeys(). |
// 2.9. Let media keys be a new MediaKeys object. |
- MediaKeys* mediaKeys = MediaKeys::create(getExecutionContext(), m_supportedSessionTypes, adoptPtr(cdm)); |
+ MediaKeys* mediaKeys = MediaKeys::create(getExecutionContext(), m_supportedSessionTypes, wrapUnique(cdm)); |
// 2.10. Resolve promise with media keys. |
resolve(mediaKeys); |
@@ -105,7 +107,7 @@ static Vector<String> convertSessionTypes(const WebVector<WebEncryptedMediaSessi |
} // namespace |
-MediaKeySystemAccess::MediaKeySystemAccess(const String& keySystem, PassOwnPtr<WebContentDecryptionModuleAccess> access) |
+MediaKeySystemAccess::MediaKeySystemAccess(const String& keySystem, std::unique_ptr<WebContentDecryptionModuleAccess> access) |
: m_keySystem(keySystem) |
, m_access(std::move(access)) |
{ |