| Index: third_party/WebKit/Source/core/layout/shapes/BoxShapeTest.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/shapes/BoxShapeTest.cpp b/third_party/WebKit/Source/core/layout/shapes/BoxShapeTest.cpp
|
| index 0c707169b20959169f8555b9a294dfa0fd67b62d..ee0611828f81497d609ca50854b17a95f2b1de0a 100644
|
| --- a/third_party/WebKit/Source/core/layout/shapes/BoxShapeTest.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/shapes/BoxShapeTest.cpp
|
| @@ -31,7 +31,6 @@
|
|
|
| #include "platform/geometry/FloatRoundedRect.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| -#include <memory>
|
|
|
| namespace blink {
|
|
|
| @@ -39,7 +38,7 @@ class BoxShapeTest : public ::testing::Test {
|
| protected:
|
| BoxShapeTest() { }
|
|
|
| - std::unique_ptr<Shape> createBoxShape(const FloatRoundedRect& bounds, float shapeMargin)
|
| + PassOwnPtr<Shape> createBoxShape(const FloatRoundedRect& bounds, float shapeMargin)
|
| {
|
| return Shape::createLayoutBoxShape(bounds, TopToBottomWritingMode, shapeMargin);
|
| }
|
| @@ -74,7 +73,7 @@ namespace {
|
| */
|
| TEST_F(BoxShapeTest, zeroRadii)
|
| {
|
| - std::unique_ptr<Shape> shape = createBoxShape(FloatRoundedRect(0, 0, 100, 50), 10);
|
| + OwnPtr<Shape> shape = createBoxShape(FloatRoundedRect(0, 0, 100, 50), 10);
|
| EXPECT_FALSE(shape->isEmpty());
|
|
|
| EXPECT_EQ(LayoutRect(-10, -10, 120, 70), shape->shapeMarginLogicalBoundingBox());
|
| @@ -119,7 +118,7 @@ TEST_F(BoxShapeTest, zeroRadii)
|
| TEST_F(BoxShapeTest, getIntervals)
|
| {
|
| const FloatRoundedRect::Radii cornerRadii(FloatSize(10, 15), FloatSize(10, 20), FloatSize(25, 15), FloatSize(20, 30));
|
| - std::unique_ptr<Shape> shape = createBoxShape(FloatRoundedRect(IntRect(0, 0, 100, 100), cornerRadii), 0);
|
| + OwnPtr<Shape> shape = createBoxShape(FloatRoundedRect(IntRect(0, 0, 100, 100), cornerRadii), 0);
|
| EXPECT_FALSE(shape->isEmpty());
|
|
|
| EXPECT_EQ(LayoutRect(0, 0, 100, 100), shape->shapeMarginLogicalBoundingBox());
|
|
|