Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/core/input/TouchEventManager.cpp

 // Copyright 2016 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/input/TouchEventManager.h"
 
 #include "core/dom/Document.h"
 #include "core/events/TouchEvent.h"
 #include "core/frame/Deprecation.h"
 #include "core/frame/EventHandlerRegistry.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/input/EventHandler.h"
 #include "core/input/TouchActionUtil.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/Page.h"
 #include "platform/Histogram.h"
 #include "platform/PlatformTouchEvent.h"
 #include "wtf/CurrentTime.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
 
 
 namespace blink {
 
 namespace {
 
 bool hasTouchHandlers(const EventHandlerRegistry& registry)
 {
     return registry.hasEventHandlers(EventHandlerRegistry::TouchStartOrMoveEventBlocking)
         || registry.hasEventHandlers(EventHandlerRegistry::TouchStartOrMoveEventPassive)
@@ skipping 431 matching lines @@
     // For now, disallow dragging as a user gesture when the events are being sent to a
     // cross-origin iframe (crbug.com/582140).
     bool isSameOrigin = false;
     if (m_touchSequenceDocument && m_touchSequenceDocument->frame()) {
         SecurityOrigin* securityOrigin = m_touchSequenceDocument->frame()->securityContext()->getSecurityOrigin();
         Frame* top = m_frame->tree().top();
         if (top && securityOrigin->canAccess(top->securityContext()->getSecurityOrigin()))
             isSameOrigin = true;
     }
 
-    std::unique_ptr<UserGestureIndicator> gestureIndicator;
+    OwnPtr<UserGestureIndicator> gestureIndicator;
     if (isTap || isSameOrigin) {
         UserGestureUtilizedCallback* callback = 0;
         // These are cases we'd like to migrate to not hold a user gesture.
         if (event.type() == PlatformEvent::TouchStart
             || event.type() == PlatformEvent::TouchMove
             || (event.type() == PlatformEvent::TouchEnd && m_touchScrollStarted)) {
             // Collect metrics in userGestureUtilized().
             callback = this;
         }
         if (m_touchSequenceUserGestureToken)
-            gestureIndicator = wrapUnique(new UserGestureIndicator(m_touchSequenceUserGestureToken.release(), callback));
+            gestureIndicator = adoptPtr(new UserGestureIndicator(m_touchSequenceUserGestureToken.release(), callback));
         else
-            gestureIndicator = wrapUnique(new UserGestureIndicator(DefinitelyProcessingUserGesture, callback));
+            gestureIndicator = adoptPtr(new UserGestureIndicator(DefinitelyProcessingUserGesture, callback));
         m_touchSequenceUserGestureToken = UserGestureIndicator::currentToken();
     }
 
     return dispatchTouchEvents(event, touchInfos, allTouchesReleased);
 }
 
 void TouchEventManager::clear()
 {
     m_touchSequenceDocument.clear();
     m_touchSequenceUserGestureToken.clear();
@@ skipping 35 matching lines @@
         feature = UseCounter::TouchEndDuringScrollUserGestureUtilized;
         break;
     default:
         NOTREACHED();
         return;
     }
     Deprecation::countDeprecation(m_frame, feature);
 }
 
 } // namespace blink