Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/platform/exported/WebCryptoAlgorithm.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "public/platform/WebCryptoAlgorithm.h"
 
 #include "public/platform/WebCryptoAlgorithmParams.h"
 #include "wtf/Assertions.h"
-#include "wtf/PtrUtil.h"
+#include "wtf/OwnPtr.h"
 #include "wtf/StdLibExtras.h"
 #include "wtf/ThreadSafeRefCounted.h"
-#include <memory>
 
 namespace blink {
 
 namespace {
 
 // A mapping from the algorithm ID to information about the algorithm.
 const WebCryptoAlgorithmInfo algorithmIdToInfo[] = {
     { // Index 0
         "AES-CBC", {
             WebCryptoAlgorithmParamsTypeAesCbcParams, // Encrypt
@@ skipping 240 matching lines @@
 static_assert(WebCryptoAlgorithmIdEcdh == 13, "ECDH id must match");
 static_assert(WebCryptoAlgorithmIdHkdf == 14, "HKDF id must match");
 static_assert(WebCryptoAlgorithmIdPbkdf2 == 15, "Pbkdf2 id must match");
 static_assert(WebCryptoAlgorithmIdLast == 15, "last id must match");
 static_assert(10 == WebCryptoOperationLast, "the parameter mapping needs to be updated");
 
 } // namespace
 
 class WebCryptoAlgorithmPrivate : public ThreadSafeRefCounted<WebCryptoAlgorithmPrivate> {
 public:
-    WebCryptoAlgorithmPrivate(WebCryptoAlgorithmId id, std::unique_ptr<WebCryptoAlgorithmParams> params)
+    WebCryptoAlgorithmPrivate(WebCryptoAlgorithmId id, PassOwnPtr<WebCryptoAlgorithmParams> params)
         : id(id)
         , params(std::move(params))
     {
     }
 
     WebCryptoAlgorithmId id;
-    std::unique_ptr<WebCryptoAlgorithmParams> params;
+    OwnPtr<WebCryptoAlgorithmParams> params;
 };
 
-WebCryptoAlgorithm::WebCryptoAlgorithm(WebCryptoAlgorithmId id, std::unique_ptr<WebCryptoAlgorithmParams> params)
+WebCryptoAlgorithm::WebCryptoAlgorithm(WebCryptoAlgorithmId id, PassOwnPtr<WebCryptoAlgorithmParams> params)
     : m_private(adoptRef(new WebCryptoAlgorithmPrivate(id, std::move(params))))
 {
 }
 
 WebCryptoAlgorithm WebCryptoAlgorithm::createNull()
 {
     return WebCryptoAlgorithm();
 }
 
 WebCryptoAlgorithm WebCryptoAlgorithm::adoptParamsAndCreate(WebCryptoAlgorithmId id, WebCryptoAlgorithmParams* params)
 {
-    return WebCryptoAlgorithm(id, wrapUnique(params));
+    return WebCryptoAlgorithm(id, adoptPtr(params));
 }
 
 const WebCryptoAlgorithmInfo* WebCryptoAlgorithm::lookupAlgorithmInfo(WebCryptoAlgorithmId id)
 {
     const unsigned idInt = id;
     if (idInt >= WTF_ARRAY_LENGTH(algorithmIdToInfo))
         return 0;
     return &algorithmIdToInfo[id];
 }
 
@@ skipping 206 matching lines @@
 {
     m_private = other.m_private;
 }
 
 void WebCryptoAlgorithm::reset()
 {
     m_private.reset();
 }
 
 } // namespace blink