| Index: third_party/WebKit/Source/core/testing/DummyPageHolder.h
|
| diff --git a/third_party/WebKit/Source/core/testing/DummyPageHolder.h b/third_party/WebKit/Source/core/testing/DummyPageHolder.h
|
| index 0a0847cd7a711a0e9c5b566deec563ee587de659..276604e57edd7781be7010b83f98491437b9cb80 100644
|
| --- a/third_party/WebKit/Source/core/testing/DummyPageHolder.h
|
| +++ b/third_party/WebKit/Source/core/testing/DummyPageHolder.h
|
| @@ -68,7 +68,7 @@ public:
|
| static PassOwnPtr<DummyPageHolder> create(
|
| const IntSize& initialViewSize = IntSize(),
|
| Page::PageClients* = 0,
|
| - PassOwnPtrWillBeRawPtr<FrameLoaderClient> = nullptr,
|
| + RawPtr<FrameLoaderClient> = nullptr,
|
| FrameSettingOverrideFunction = nullptr);
|
| ~DummyPageHolder();
|
|
|
| @@ -78,12 +78,12 @@ public:
|
| Document& document() const;
|
|
|
| private:
|
| - DummyPageHolder(const IntSize& initialViewSize, Page::PageClients*, PassOwnPtrWillBeRawPtr<FrameLoaderClient>, FrameSettingOverrideFunction settingOverrider);
|
| + DummyPageHolder(const IntSize& initialViewSize, Page::PageClients*, RawPtr<FrameLoaderClient>, FrameSettingOverrideFunction settingOverrider);
|
|
|
| - OwnPtrWillBePersistent<Page> m_page;
|
| - RefPtrWillBePersistent<LocalFrame> m_frame;
|
| + Persistent<Page> m_page;
|
| + Persistent<LocalFrame> m_frame;
|
|
|
| - OwnPtrWillBePersistent<FrameLoaderClient> m_frameLoaderClient;
|
| + Persistent<FrameLoaderClient> m_frameLoaderClient;
|
| };
|
|
|
| } // namespace blink
|
|
|