Oilpan: Remove WillBe types (part 9)

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef LayoutTestHelper_h
 #define LayoutTestHelper_h
 
 #include "core/dom/Document.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLElement.h"
 #include "core/loader/EmptyClients.h"
 #include "core/testing/DummyPageHolder.h"
 #include "wtf/Allocator.h"
 #include "wtf/OwnPtr.h"
 #include <gtest/gtest.h>
 
 namespace blink {
 
 class RenderingTest : public testing::Test {
     USING_FAST_MALLOC(RenderingTest);
 public:
     virtual FrameSettingOverrideFunction settingOverrider() const { return nullptr; }
 
-    RenderingTest(PassOwnPtrWillBeRawPtr<FrameLoaderClient> = nullptr);
+    RenderingTest(RawPtr<FrameLoaderClient> = nullptr);
 
 protected:
     void SetUp() override;
     void TearDown() override;
 
     Document& document() const { return m_pageHolder->document(); }
 
     // Both sets the inner html and runs the document lifecycle.
     void setBodyInnerHTML(const String& htmlContent)
     {
@@ skipping 13 matching lines @@
         document().view()->updateAllLifecyclePhases();
     }
 
     LayoutObject* getLayoutObjectByElementId(const char* id) const
     {
         Node* node = document().getElementById(id);
         return node ? node->layoutObject() : nullptr;
     }
 
 private:
-    RefPtrWillBePersistent<LocalFrame> m_subframe;
-    OwnPtrWillBePersistent<FrameLoaderClient> m_frameLoaderClient;
-    OwnPtrWillBePersistent<FrameLoaderClient> m_childFrameLoaderClient;
+    Persistent<LocalFrame> m_subframe;
+    Persistent<FrameLoaderClient> m_frameLoaderClient;
+    Persistent<FrameLoaderClient> m_childFrameLoaderClient;
     OwnPtr<DummyPageHolder> m_pageHolder;
 };
 
 class SingleChildFrameLoaderClient final : public EmptyFrameLoaderClient {
 public:
-    static PassOwnPtrWillBeRawPtr<SingleChildFrameLoaderClient> create() { return adoptPtrWillBeNoop(new SingleChildFrameLoaderClient); }
+    static RawPtr<SingleChildFrameLoaderClient> create() { return adoptPtrWillBeNoop(new SingleChildFrameLoaderClient); }
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
         visitor->trace(m_child);
         EmptyFrameLoaderClient::trace(visitor);
     }
 
     Frame* firstChild() const override { return m_child.get(); }
     Frame* lastChild() const override { return m_child.get(); }
 
     void setChild(Frame* child) { m_child = child; }
 
 private:
     SingleChildFrameLoaderClient() : m_child(nullptr) { }
 
-    RefPtrWillBeMember<Frame> m_child;
+    Member<Frame> m_child;
 };
 
 class FrameLoaderClientWithParent final : public EmptyFrameLoaderClient {
 public:
-    static PassOwnPtrWillBeRawPtr<FrameLoaderClientWithParent> create(Frame* parent)
+    static RawPtr<FrameLoaderClientWithParent> create(Frame* parent)
     {
-        return adoptPtrWillBeNoop(new FrameLoaderClientWithParent(parent));
+        return new FrameLoaderClientWithParent(parent);
     }
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
         visitor->trace(m_parent);
         EmptyFrameLoaderClient::trace(visitor);
     }
 
     Frame* parent() const override { return m_parent.get(); }
 
 private:
     explicit FrameLoaderClientWithParent(Frame* parent) : m_parent(parent) { }
 
-    RefPtrWillBeMember<Frame> m_parent;
+    Member<Frame> m_parent;
 };
 
 } // namespace blink
 
 #endif // LayoutTestHelper_h