Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/bindings/core/v8/ScriptPromisePropertyBase.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 "bindings/core/v8/ScriptPromisePropertyBase.h"
 
 #include "bindings/core/v8/ScopedPersistent.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8HiddenValue.h"
 #include "core/dom/ExecutionContext.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
 
 namespace blink {
 
 ScriptPromisePropertyBase::ScriptPromisePropertyBase(ExecutionContext* executionContext, Name name)
     : ContextLifecycleObserver(executionContext)
     , m_isolate(toIsolate(executionContext))
     , m_name(name)
     , m_state(Pending)
 {
 }
@@ skipping 52 matching lines @@
 {
     ASSERT(getExecutionContext());
     ASSERT(m_state == Pending);
     ASSERT(targetState == Resolved || targetState == Rejected);
 
     m_state = targetState;
 
     v8::HandleScope handleScope(m_isolate);
     size_t i = 0;
     while (i < m_wrappers.size()) {
-        const std::unique_ptr<ScopedPersistent<v8::Object>>& persistent = m_wrappers[i];
+        const OwnPtr<ScopedPersistent<v8::Object>>& persistent = m_wrappers[i];
         if (persistent->isEmpty()) {
             // wrapper has died.
             // Since v8 GC can run during the iteration and clear the reference,
             // we can't move this check out of the loop.
             m_wrappers.remove(i);
             continue;
         }
         v8::Local<v8::Object> wrapper = persistent->newLocal(m_isolate);
         ScriptState* scriptState = ScriptState::from(wrapper->CreationContext());
         ScriptState::Scope scope(scriptState);
@@ skipping 27 matching lines @@
         resolver->Reject(context, rejectedValue(m_isolate, context->Global()));
         break;
     }
 }
 
 v8::Local<v8::Object> ScriptPromisePropertyBase::ensureHolderWrapper(ScriptState* scriptState)
 {
     v8::Local<v8::Context> context = scriptState->context();
     size_t i = 0;
     while (i < m_wrappers.size()) {
-        const std::unique_ptr<ScopedPersistent<v8::Object>>& persistent = m_wrappers[i];
+        const OwnPtr<ScopedPersistent<v8::Object>>& persistent = m_wrappers[i];
         if (persistent->isEmpty()) {
             // wrapper has died.
             // Since v8 GC can run during the iteration and clear the reference,
             // we can't move this check out of the loop.
             m_wrappers.remove(i);
             continue;
         }
 
         v8::Local<v8::Object> wrapper = persistent->newLocal(m_isolate);
         if (wrapper->CreationContext() == context)
             return wrapper;
         ++i;
     }
     v8::Local<v8::Object> wrapper = holder(m_isolate, context->Global());
-    std::unique_ptr<ScopedPersistent<v8::Object>> weakPersistent = wrapUnique(new ScopedPersistent<v8::Object>);
+    OwnPtr<ScopedPersistent<v8::Object>> weakPersistent = adoptPtr(new ScopedPersistent<v8::Object>);
     weakPersistent->set(m_isolate, wrapper);
     weakPersistent->setWeak(weakPersistent.get(), &clearHandle);
     m_wrappers.append(std::move(weakPersistent));
     return wrapper;
 }
 
 void ScriptPromisePropertyBase::clearWrappers()
 {
     checkThis();
     checkWrappers();
@@ skipping 50 matching lines @@
     ASSERT_NOT_REACHED();
     return v8::Local<v8::String>();
 }
 
 DEFINE_TRACE(ScriptPromisePropertyBase)
 {
     ContextLifecycleObserver::trace(visitor);
 }
 
 } // namespace blink