| Index: third_party/WebKit/Source/web/PageOverlayTest.cpp
|
| diff --git a/third_party/WebKit/Source/web/PageOverlayTest.cpp b/third_party/WebKit/Source/web/PageOverlayTest.cpp
|
| index 5ada6d1fff2b4398beb9b32bf6f7260bc535bf9f..5eddde85240c99dac0c1e77c71f2ce92f5ccca69 100644
|
| --- a/third_party/WebKit/Source/web/PageOverlayTest.cpp
|
| +++ b/third_party/WebKit/Source/web/PageOverlayTest.cpp
|
| @@ -22,7 +22,6 @@
|
| #include "web/WebLocalFrameImpl.h"
|
| #include "web/WebViewImpl.h"
|
| #include "web/tests/FrameTestHelpers.h"
|
| -#include <memory>
|
|
|
| using testing::_;
|
| using testing::AtLeast;
|
| @@ -80,7 +79,7 @@ protected:
|
|
|
| WebViewImpl* webViewImpl() const { return m_helper.webViewImpl(); }
|
|
|
| - std::unique_ptr<PageOverlay> createSolidYellowOverlay()
|
| + PassOwnPtr<PageOverlay> createSolidYellowOverlay()
|
| {
|
| return PageOverlay::create(webViewImpl(), new SolidColorOverlay(SK_ColorYELLOW));
|
| }
|
| @@ -112,7 +111,7 @@ TEST_F(PageOverlayTest, PageOverlay_AcceleratedCompositing)
|
| initialize(AcceleratedCompositing);
|
| webViewImpl()->layerTreeView()->setViewportSize(WebSize(viewportWidth, viewportHeight));
|
|
|
| - std::unique_ptr<PageOverlay> pageOverlay = createSolidYellowOverlay();
|
| + OwnPtr<PageOverlay> pageOverlay = createSolidYellowOverlay();
|
| pageOverlay->update();
|
| webViewImpl()->updateAllLifecyclePhases();
|
|
|
| @@ -142,7 +141,7 @@ TEST_F(PageOverlayTest, PageOverlay_AcceleratedCompositing)
|
| TEST_F(PageOverlayTest, PageOverlay_VisualRect)
|
| {
|
| initialize(AcceleratedCompositing);
|
| - std::unique_ptr<PageOverlay> pageOverlay = createSolidYellowOverlay();
|
| + OwnPtr<PageOverlay> pageOverlay = createSolidYellowOverlay();
|
| pageOverlay->update();
|
| webViewImpl()->updateAllLifecyclePhases();
|
| EXPECT_EQ(LayoutRect(0, 0, viewportWidth, viewportHeight), pageOverlay->visualRect());
|
|
|