Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/core/layout/LayoutBlockFlow.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2003-2013 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  * 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
@@ skipping 25 matching lines @@
 #ifndef LayoutBlockFlow_h
 #define LayoutBlockFlow_h
 
 #include "core/CoreExport.h"
 #include "core/layout/FloatingObjects.h"
 #include "core/layout/LayoutBlock.h"
 #include "core/layout/api/LineLayoutItem.h"
 #include "core/layout/line/LineBoxList.h"
 #include "core/layout/line/RootInlineBox.h"
 #include "core/layout/line/TrailingObjects.h"
-#include <memory>
 
 namespace blink {
 
 class BlockChildrenLayoutInfo;
 class MarginInfo;
 class LayoutInline;
 class LineInfo;
 class LineLayoutState;
 class LineWidth;
 class LayoutMultiColumnFlowThread;
@@ skipping 552 matching lines @@
 
     LayoutBlockFlowRareData& ensureRareData();
 
     LayoutUnit m_paintInvalidationLogicalTop;
     LayoutUnit m_paintInvalidationLogicalBottom;
 
     bool isSelfCollapsingBlock() const override;
     bool checkIfIsSelfCollapsingBlock() const;
 
 protected:
-    std::unique_ptr<LayoutBlockFlowRareData> m_rareData;
-    std::unique_ptr<FloatingObjects> m_floatingObjects;
+    OwnPtr<LayoutBlockFlowRareData> m_rareData;
+    OwnPtr<FloatingObjects> m_floatingObjects;
 
     friend class MarginInfo;
     friend class LineWidth; // needs to know FloatingObject
 
     // LayoutRubyBase objects need to be able to split and merge, moving their children around
     // (calling makeChildrenNonInline).
     // TODO(mstensho): Try to get rid of this friendship.
     friend class LayoutRubyBase;
 
 // FIXME-BLOCKFLOW: These methods have implementations in
@@ skipping 32 matching lines @@
 
 // END METHODS DEFINED IN LayoutBlockFlowLine
 
 };
 
 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow());
 
 } // namespace blink
 
 #endif // LayoutBlockFlow_h