Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/modules/encryptedmedia/MediaKeySystemAccess.cpp

 // 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 "modules/encryptedmedia/MediaKeySystemAccess.h"
 
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
 #include "modules/encryptedmedia/ContentDecryptionModuleResultPromise.h"
 #include "modules/encryptedmedia/EncryptedMediaUtils.h"
 #include "modules/encryptedmedia/MediaKeySession.h"
 #include "modules/encryptedmedia/MediaKeys.h"
 #include "modules/encryptedmedia/MediaKeysController.h"
 #include "platform/Logging.h"
 #include "platform/Timer.h"
 #include "public/platform/WebContentDecryptionModule.h"
 #include "public/platform/WebEncryptedMediaTypes.h"
 #include "public/platform/WebMediaKeySystemConfiguration.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
 
 namespace blink {
 
 namespace {
 
 // This class wraps the promise resolver used when creating MediaKeys
 // and is passed to Chromium to fullfill the promise. This implementation of
 // completeWithCdm() will resolve the promise with a new MediaKeys object,
 // while completeWithError() will reject the promise with an exception.
 // All other complete methods are not expected to be called, and will
@@ skipping 10 matching lines @@
 
     ~NewCdmResultPromise() override
     {
     }
 
     // ContentDecryptionModuleResult implementation.
     void completeWithContentDecryptionModule(WebContentDecryptionModule* cdm) override
     {
         // 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, wrapUnique(cdm));
+        MediaKeys* mediaKeys = MediaKeys::create(getExecutionContext(), m_supportedSessionTypes, adoptPtr(cdm));
 
         // 2.10. Resolve promise with media keys.
         resolve(mediaKeys);
     }
 
 private:
     WebVector<WebEncryptedMediaSessionType> m_supportedSessionTypes;
 };
 
 // These methods are the inverses of those with the same names in
@@ skipping 36 matching lines @@
 static Vector<String> convertSessionTypes(const WebVector<WebEncryptedMediaSessionType>& sessionTypes)
 {
     Vector<String> result(sessionTypes.size());
     for (size_t i = 0; i < sessionTypes.size(); i++)
         result[i] = EncryptedMediaUtils::convertFromSessionType(sessionTypes[i]);
     return result;
 }
 
 } // namespace
 
-MediaKeySystemAccess::MediaKeySystemAccess(const String& keySystem, std::unique_ptr<WebContentDecryptionModuleAccess> access)
+MediaKeySystemAccess::MediaKeySystemAccess(const String& keySystem, PassOwnPtr<WebContentDecryptionModuleAccess> access)
     : m_keySystem(keySystem)
     , m_access(std::move(access))
 {
 }
 
 MediaKeySystemAccess::~MediaKeySystemAccess()
 {
 }
 
 void MediaKeySystemAccess::getConfiguration(MediaKeySystemConfiguration& result)
@@ skipping 42 matching lines @@
 
     // 3. Return promise.
     return promise;
 }
 
 DEFINE_TRACE(MediaKeySystemAccess)
 {
 }
 
 } // namespace blink