Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/core/page/scrolling/ScrollState.cpp

 // Copyright 2015 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 "core/page/scrolling/ScrollState.h"
 
 #include "core/dom/DOMNodeIds.h"
 #include "core/dom/Element.h"
 #include "core/dom/ExceptionCode.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
 
 namespace blink {
 
 namespace {
 Element* elementForId(int elementId)
 {
     Node* node = DOMNodeIds::nodeForId(elementId);
     ASSERT(node);
     if (!node)
         return nullptr;
     ASSERT(node->isElementNode());
     if (!node->isElementNode())
         return nullptr;
     return static_cast<Element*>(node);
 }
 } // namespace
 
 ScrollState* ScrollState::create(ScrollStateInit init)
 {
-    std::unique_ptr<ScrollStateData> scrollStateData = wrapUnique(new ScrollStateData());
+    OwnPtr<ScrollStateData> scrollStateData = adoptPtr(new ScrollStateData());
     scrollStateData->delta_x = init.deltaX();
     scrollStateData->delta_y = init.deltaY();
     scrollStateData->position_x = init.positionX();
     scrollStateData->position_y = init.positionY();
     scrollStateData->velocity_x = init.velocityX();
     scrollStateData->velocity_y = init.velocityY();
     scrollStateData->is_beginning = init.isBeginning();
     scrollStateData->is_in_inertial_phase = init.isInInertialPhase();
     scrollStateData->is_ending = init.isEnding();
     scrollStateData->should_propagate = init.shouldPropagate();
     scrollStateData->from_user_input = init.fromUserInput();
     scrollStateData->is_direct_manipulation = init.isDirectManipulation();
     scrollStateData->delta_granularity = init.deltaGranularity();
     ScrollState* scrollState = new ScrollState(std::move(scrollStateData));
     return scrollState;
 }
 
-ScrollState* ScrollState::create(std::unique_ptr<ScrollStateData> data)
+ScrollState* ScrollState::create(PassOwnPtr<ScrollStateData> data)
 {
     ScrollState* scrollState = new ScrollState(std::move(data));
     return scrollState;
 }
 
-ScrollState::ScrollState(std::unique_ptr<ScrollStateData> data)
+ScrollState::ScrollState(PassOwnPtr<ScrollStateData> data)
     : m_data(std::move(data))
 {
 }
 
 void ScrollState::consumeDelta(double x, double y, ExceptionState& exceptionState)
 {
     if ((m_data->delta_x > 0 && 0 > x) || (m_data->delta_x < 0 && 0 < x) || (m_data->delta_y > 0 && 0 > y) || (m_data->delta_y < 0 && 0 < y)) {
         exceptionState.throwDOMException(InvalidModificationError, "Can't increase delta using consumeDelta");
         return;
     }
@@ skipping 38 matching lines @@
 {
     m_data->set_current_native_scrolling_element(DOMNodeIds::idForNode(element));
 }
 
 void ScrollState::setCurrentNativeScrollingElementById(int elementId)
 {
     m_data->set_current_native_scrolling_element(elementId);
 }
 
 } // namespace blink