Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.h

 /*
  * Copyright (C) 2003, 2009, 2012 Apple Inc. All rights reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@web.de>
  *   Randall Jesup <rjesup@wgate.com>
@@ skipping 32 matching lines @@
 
 #ifndef PaintLayerScrollableArea_h
 #define PaintLayerScrollableArea_h
 
 #include "core/CoreExport.h"
 #include "core/layout/ScrollAnchor.h"
 #include "core/layout/ScrollEnums.h"
 #include "core/paint/PaintInvalidationCapableScrollableArea.h"
 #include "core/paint/PaintLayerFragment.h"
 #include "platform/heap/Handle.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
 
 namespace blink {
 
 enum ResizerHitTestType {
     ResizerForPointer,
     ResizerForTouch
 };
 
 class ComputedStyle;
 class HitTestResult;
@@ skipping 387 matching lines @@
     void updateCompositingLayersAfterScroll();
 
     PaintLayerScrollableAreaRareData* rareData()
     {
         return m_rareData.get();
     }
 
     PaintLayerScrollableAreaRareData& ensureRareData()
     {
         if (!m_rareData)
-            m_rareData = wrapUnique(new PaintLayerScrollableAreaRareData());
+            m_rareData = adoptPtr(new PaintLayerScrollableAreaRareData());
         return *m_rareData.get();
     }
 
     // PaintInvalidationCapableScrollableArea
     LayoutBox& boxForScrollControlPaintInvalidation() const { return box(); }
 
     PaintLayer& m_layer;
 
     // Keeps track of whether the layer is currently resizing, so events can cause resizing to start and stop.
     unsigned m_inResizeMode : 1;
@@ skipping 31 matching lines @@
     IntPoint m_cachedOverlayScrollbarOffset;
 
     // LayoutObject to hold our custom scroll corner.
     LayoutScrollbarPart* m_scrollCorner;
 
     // LayoutObject to hold our custom resizer.
     LayoutScrollbarPart* m_resizer;
 
     ScrollAnchor m_scrollAnchor;
 
-    std::unique_ptr<PaintLayerScrollableAreaRareData> m_rareData;
+    OwnPtr<PaintLayerScrollableAreaRareData> m_rareData;
 
 #if ENABLE(ASSERT)
     bool m_hasBeenDisposed;
 #endif
 };
 
 DEFINE_TYPE_CASTS(PaintLayerScrollableArea, ScrollableArea, scrollableArea,
     scrollableArea->isPaintLayerScrollableArea(),
     scrollableArea.isPaintLayerScrollableArea());
 
 } // namespace blink
 
 #endif // LayerScrollableArea_h