Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/core/dom/shadow/FlatTreeTraversalTest.cpp

 // Copyright 2015 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.
 
 #include "core/dom/shadow/FlatTreeTraversal.h"
 
 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/dom/Node.h"
@@ skipping 24 matching lines @@
     void setupSampleHTML(const char* mainHTML, const char* shadowHTML, unsigned);
 
     void setupDocumentTree(const char* mainHTML);
 
     void attachV0ShadowRoot(Element& shadowHost, const char* shadowInnerHTML);
     void attachOpenShadowRoot(Element& shadowHost, const char* shadowInnerHTML);
 
 private:
     void SetUp() override;
 
-    RefPtrWillBePersistent<HTMLDocument> m_document;
+    Persistent<HTMLDocument> m_document;
     OwnPtr<DummyPageHolder> m_dummyPageHolder;
 };
 
 void FlatTreeTraversalTest::SetUp()
 {
     m_dummyPageHolder = DummyPageHolder::create(IntSize(800, 600));
     m_document = toHTMLDocument(&m_dummyPageHolder->document());
     ASSERT(m_document);
 }
 
 HTMLDocument& FlatTreeTraversalTest::document() const
 {
     return *m_document;
 }
 
 void FlatTreeTraversalTest::setupSampleHTML(const char* mainHTML, const char* shadowHTML, unsigned index)
 {
-    RefPtrWillBeRawPtr<Element> body = document().body();
+    RawPtr<Element> body = document().body();
     body->setInnerHTML(String::fromUTF8(mainHTML), ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> shadowHost = toElement(NodeTraversal::childAt(*body, index));
-    RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = shadowHost->createShadowRootInternal(ShadowRootType::V0, ASSERT_NO_EXCEPTION);
+    RawPtr<Element> shadowHost = toElement(NodeTraversal::childAt(*body, index));
+    RawPtr<ShadowRoot> shadowRoot = shadowHost->createShadowRootInternal(ShadowRootType::V0, ASSERT_NO_EXCEPTION);
     shadowRoot->setInnerHTML(String::fromUTF8(shadowHTML), ASSERT_NO_EXCEPTION);
     body->updateDistribution();
 }
 
 void FlatTreeTraversalTest::setupDocumentTree(const char* mainHTML)
 {
-    RefPtrWillBeRawPtr<Element> body = document().body();
+    RawPtr<Element> body = document().body();
     body->setInnerHTML(String::fromUTF8(mainHTML), ASSERT_NO_EXCEPTION);
 }
 
 void FlatTreeTraversalTest::attachV0ShadowRoot(Element& shadowHost, const char* shadowInnerHTML)
 {
-    RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = shadowHost.createShadowRootInternal(ShadowRootType::V0, ASSERT_NO_EXCEPTION);
+    RawPtr<ShadowRoot> shadowRoot = shadowHost.createShadowRootInternal(ShadowRootType::V0, ASSERT_NO_EXCEPTION);
     shadowRoot->setInnerHTML(String::fromUTF8(shadowInnerHTML), ASSERT_NO_EXCEPTION);
     document().body()->updateDistribution();
 }
 
 void FlatTreeTraversalTest::attachOpenShadowRoot(Element& shadowHost, const char* shadowInnerHTML)
 {
-    RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = shadowHost.createShadowRootInternal(ShadowRootType::Open, ASSERT_NO_EXCEPTION);
+    RawPtr<ShadowRoot> shadowRoot = shadowHost.createShadowRootInternal(ShadowRootType::Open, ASSERT_NO_EXCEPTION);
     shadowRoot->setInnerHTML(String::fromUTF8(shadowInnerHTML), ASSERT_NO_EXCEPTION);
     document().body()->updateDistribution();
 }
 
 void testCommonAncestor(Node* expectedResult, const Node& nodeA, const Node& nodeB)
 {
     Node* result1 = FlatTreeTraversal::commonAncestor(nodeA, nodeB);
     EXPECT_EQ(expectedResult, result1) << "commonAncestor(" << nodeA.textContent() << "," << nodeB.textContent() << ")";
     Node* result2 = FlatTreeTraversal::commonAncestor(nodeB, nodeA);
     EXPECT_EQ(expectedResult, result2) << "commonAncestor(" << nodeB.textContent() << "," << nodeA.textContent() << ")";
@@ skipping 13 matching lines @@
             "<span id='m01'>m01</span>"
         "</div>";
     const char* shadowHTML =
         "<a id='s00'>s00</a>"
         "<content select='#m01'></content>"
         "<a id='s02'>s02</a>"
         "<a id='s03'><content select='#m00'></content></a>"
         "<a id='s04'>s04</a>";
     setupSampleHTML(mainHTML, shadowHTML, 0);
 
-    RefPtrWillBeRawPtr<Element> body = document().body();
-    RefPtrWillBeRawPtr<Element> m0 = body->querySelector("#m0", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> m00 = m0->querySelector("#m00", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> m01 = m0->querySelector("#m01", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> body = document().body();
+    RawPtr<Element> m0 = body->querySelector("#m0", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> m00 = m0->querySelector("#m00", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> m01 = m0->querySelector("#m01", ASSERT_NO_EXCEPTION);
 
-    RefPtrWillBeRawPtr<Element> shadowHost = m0;
-    RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = shadowHost->openShadowRoot();
-    RefPtrWillBeRawPtr<Element> s00 = shadowRoot->querySelector("#s00", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> s02 = shadowRoot->querySelector("#s02", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> s03 = shadowRoot->querySelector("#s03", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> s04 = shadowRoot->querySelector("#s04", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> shadowHost = m0;
+    RawPtr<ShadowRoot> shadowRoot = shadowHost->openShadowRoot();
+    RawPtr<Element> s00 = shadowRoot->querySelector("#s00", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> s02 = shadowRoot->querySelector("#s02", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> s03 = shadowRoot->querySelector("#s03", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> s04 = shadowRoot->querySelector("#s04", ASSERT_NO_EXCEPTION);
 
     const unsigned numberOfChildNodes = 5;
     Node* expectedChildNodes[5] = { s00.get(), m01.get(), s02.get(), s03.get(), s04.get() };
 
     ASSERT_EQ(numberOfChildNodes, FlatTreeTraversal::countChildren(*shadowHost));
     EXPECT_TRUE(FlatTreeTraversal::hasChildren(*shadowHost));
 
     for (unsigned index = 0; index < numberOfChildNodes; ++index) {
         Node* child = FlatTreeTraversal::childAt(*shadowHost, index);
         EXPECT_EQ(expectedChildNodes[index], child)
@@ skipping 44 matching lines @@
     const char* shadowHTML =
         "<a id='s10'>s10</a>"
         "<a id='s11'><content select='#m12'></content></a>"
         "<a id='s12'>s12</a>"
         "<a id='s13'>"
             "<content select='#m10'></content>"
             "<content select='#m11'></content>"
         "</a>"
         "<a id='s14'>s14</a>";
     setupSampleHTML(mainHTML, shadowHTML, 1);
-    RefPtrWillBeRawPtr<Element> body = document().body();
-    RefPtrWillBeRawPtr<Element> m0 = body->querySelector("#m0", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> m1 = body->querySelector("#m1", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> m2 = body->querySelector("#m2", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> body = document().body();
+    RawPtr<Element> m0 = body->querySelector("#m0", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> m1 = body->querySelector("#m1", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> m2 = body->querySelector("#m2", ASSERT_NO_EXCEPTION);
 
-    RefPtrWillBeRawPtr<Element> m00 = body->querySelector("#m00", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> m01 = body->querySelector("#m01", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> m10 = body->querySelector("#m10", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> m11 = body->querySelector("#m11", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> m12 = body->querySelector("#m12", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> m20 = body->querySelector("#m20", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> m21 = body->querySelector("#m21", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> m00 = body->querySelector("#m00", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> m01 = body->querySelector("#m01", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> m10 = body->querySelector("#m10", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> m11 = body->querySelector("#m11", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> m12 = body->querySelector("#m12", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> m20 = body->querySelector("#m20", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> m21 = body->querySelector("#m21", ASSERT_NO_EXCEPTION);
 
-    RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = m1->openShadowRoot();
-    RefPtrWillBeRawPtr<Element> s10 = shadowRoot->querySelector("#s10", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> s11 = shadowRoot->querySelector("#s11", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> s12 = shadowRoot->querySelector("#s12", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> s13 = shadowRoot->querySelector("#s13", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> s14 = shadowRoot->querySelector("#s14", ASSERT_NO_EXCEPTION);
+    RawPtr<ShadowRoot> shadowRoot = m1->openShadowRoot();
+    RawPtr<Element> s10 = shadowRoot->querySelector("#s10", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> s11 = shadowRoot->querySelector("#s11", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> s12 = shadowRoot->querySelector("#s12", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> s13 = shadowRoot->querySelector("#s13", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> s14 = shadowRoot->querySelector("#s14", ASSERT_NO_EXCEPTION);
 
     testCommonAncestor(body.get(), *m0, *m1);
     testCommonAncestor(body.get(), *m1, *m2);
     testCommonAncestor(body.get(), *m1, *m20);
     testCommonAncestor(body.get(), *s14, *m21);
 
     testCommonAncestor(m0.get(), *m0, *m0);
     testCommonAncestor(m0.get(), *m00, *m01);
 
     testCommonAncestor(m1.get(), *m1.get(), *m1);
@@ skipping 32 matching lines @@
         "<div id='m2'>m2</div>";
     const char* shadowHTML =
         "<content select='#m11'></content>"
         "<a id='s11'>s11</a>"
         "<a id='s12'>"
             "<b id='s120'>s120</b>"
             "<content select='#m10'></content>"
         "</a>";
     setupSampleHTML(mainHTML, shadowHTML, 1);
 
-    RefPtrWillBeRawPtr<Element> body = document().body();
-    RefPtrWillBeRawPtr<Element> m0 = body->querySelector("#m0", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> m1 = body->querySelector("#m1", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> m2 = body->querySelector("#m2", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> body = document().body();
+    RawPtr<Element> m0 = body->querySelector("#m0", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> m1 = body->querySelector("#m1", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> m2 = body->querySelector("#m2", ASSERT_NO_EXCEPTION);
 
-    RefPtrWillBeRawPtr<Element> m10 = body->querySelector("#m10", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> m11 = body->querySelector("#m11", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> m10 = body->querySelector("#m10", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> m11 = body->querySelector("#m11", ASSERT_NO_EXCEPTION);
 
-    RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = m1->openShadowRoot();
-    RefPtrWillBeRawPtr<Element> s11 = shadowRoot->querySelector("#s11", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> s12 = shadowRoot->querySelector("#s12", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> s120 = shadowRoot->querySelector("#s120", ASSERT_NO_EXCEPTION);
+    RawPtr<ShadowRoot> shadowRoot = m1->openShadowRoot();
+    RawPtr<Element> s11 = shadowRoot->querySelector("#s11", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> s12 = shadowRoot->querySelector("#s12", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> s120 = shadowRoot->querySelector("#s120", ASSERT_NO_EXCEPTION);
 
     // Main tree node to main tree node
     EXPECT_EQ(*m1, FlatTreeTraversal::nextSkippingChildren(*m0));
     EXPECT_EQ(*m0, FlatTreeTraversal::previousSkippingChildren(*m1));
 
     // Distribute node to main tree node
     EXPECT_EQ(*m2, FlatTreeTraversal::nextSkippingChildren(*m10));
     EXPECT_EQ(*m1, FlatTreeTraversal::previousSkippingChildren(*m2));
 
     // Distribute node to node in shadow tree
@@ skipping 26 matching lines @@
         "</div>"
         "<div id='m2'></div>";
     const char* shadowHTML =
         "<content select='#m11'></content>"
         "<a id='s11'>s11</a>"
         "<a id='s12'>"
             "<content select='#m10'></content>"
         "</a>";
     setupSampleHTML(mainHTML, shadowHTML, 1);
 
-    RefPtrWillBeRawPtr<Element> body = document().body();
-    RefPtrWillBeRawPtr<Element> m0 = body->querySelector("#m0", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> m1 = body->querySelector("#m1", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> m2 = body->querySelector("#m2", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> body = document().body();
+    RawPtr<Element> m0 = body->querySelector("#m0", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> m1 = body->querySelector("#m1", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> m2 = body->querySelector("#m2", ASSERT_NO_EXCEPTION);
 
-    RefPtrWillBeRawPtr<Element> m10 = body->querySelector("#m10", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> m10 = body->querySelector("#m10", ASSERT_NO_EXCEPTION);
 
-    RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = m1->openShadowRoot();
-    RefPtrWillBeRawPtr<Element> s11 = shadowRoot->querySelector("#s11", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> s12 = shadowRoot->querySelector("#s12", ASSERT_NO_EXCEPTION);
+    RawPtr<ShadowRoot> shadowRoot = m1->openShadowRoot();
+    RawPtr<Element> s11 = shadowRoot->querySelector("#s11", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> s12 = shadowRoot->querySelector("#s12", ASSERT_NO_EXCEPTION);
 
     EXPECT_EQ(m0->firstChild(), FlatTreeTraversal::lastWithin(*m0));
     EXPECT_EQ(*m0->firstChild(), FlatTreeTraversal::lastWithinOrSelf(*m0));
 
     EXPECT_EQ(m10->firstChild(), FlatTreeTraversal::lastWithin(*m1));
     EXPECT_EQ(*m10->firstChild(), FlatTreeTraversal::lastWithinOrSelf(*m1));
 
     EXPECT_EQ(nullptr, FlatTreeTraversal::lastWithin(*m2));
     EXPECT_EQ(*m2, FlatTreeTraversal::lastWithinOrSelf(*m2));
 
@@ skipping 15 matching lines @@
         "<div id='m2'>m2</div>";
     const char* shadowHTML =
         "<content select='#m11'></content>"
         "<a id='s11'>s11</a>"
         "<a id='s12'>"
             "<b id='s120'>s120</b>"
             "<content select='#m10'></content>"
         "</a>";
     setupSampleHTML(mainHTML, shadowHTML, 1);
 
-    RefPtrWillBeRawPtr<Element> body = document().body();
-    RefPtrWillBeRawPtr<Element> m0 = body->querySelector("#m0", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> m1 = body->querySelector("#m1", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> m2 = body->querySelector("#m2", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> body = document().body();
+    RawPtr<Element> m0 = body->querySelector("#m0", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> m1 = body->querySelector("#m1", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> m2 = body->querySelector("#m2", ASSERT_NO_EXCEPTION);
 
-    RefPtrWillBeRawPtr<Element> m10 = body->querySelector("#m10", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> m11 = body->querySelector("#m11", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> m10 = body->querySelector("#m10", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> m11 = body->querySelector("#m11", ASSERT_NO_EXCEPTION);
 
-    RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = m1->openShadowRoot();
-    RefPtrWillBeRawPtr<Element> s11 = shadowRoot->querySelector("#s11", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> s12 = shadowRoot->querySelector("#s12", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> s120 = shadowRoot->querySelector("#s120", ASSERT_NO_EXCEPTION);
+    RawPtr<ShadowRoot> shadowRoot = m1->openShadowRoot();
+    RawPtr<Element> s11 = shadowRoot->querySelector("#s11", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> s12 = shadowRoot->querySelector("#s12", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> s120 = shadowRoot->querySelector("#s120", ASSERT_NO_EXCEPTION);
 
     EXPECT_EQ(*m0->firstChild(), FlatTreeTraversal::previousPostOrder(*m0));
     EXPECT_EQ(*s12, FlatTreeTraversal::previousPostOrder(*m1));
     EXPECT_EQ(*m10->firstChild(), FlatTreeTraversal::previousPostOrder(*m10));
     EXPECT_EQ(*s120, FlatTreeTraversal::previousPostOrder(*m10->firstChild()));
     EXPECT_EQ(*s120, FlatTreeTraversal::previousPostOrder(*m10->firstChild(), s12.get()));
     EXPECT_EQ(*m11->firstChild(), FlatTreeTraversal::previousPostOrder(*m11));
     EXPECT_EQ(*m0, FlatTreeTraversal::previousPostOrder(*m11->firstChild()));
     EXPECT_EQ(nullptr, FlatTreeTraversal::previousPostOrder(*m11->firstChild(), m11.get()));
     EXPECT_EQ(*m2->firstChild(), FlatTreeTraversal::previousPostOrder(*m2));
@@ skipping 11 matching lines @@
         "<div id='m0'>m0</div>"
         "<div id='m1'>"
             "<span id='m10'>m10</span>"
             "<span id='m11'>m11</span>"
         "</div>"
         "<div id='m2'>m2</div>";
     const char* shadowHTML =
         "<content select='#m11'></content>";
     setupSampleHTML(mainHTML, shadowHTML, 1);
 
-    RefPtrWillBeRawPtr<Element> body = document().body();
-    RefPtrWillBeRawPtr<Element> m10 = body->querySelector("#m10", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> body = document().body();
+    RawPtr<Element> m10 = body->querySelector("#m10", ASSERT_NO_EXCEPTION);
 
     EXPECT_EQ(nullptr, FlatTreeTraversal::nextSibling(*m10));
     EXPECT_EQ(nullptr, FlatTreeTraversal::previousSibling(*m10));
 }
 
 TEST_F(FlatTreeTraversalTest, redistribution)
 {
     const char* mainHTML =
         "<div id='m0'>m0</div>"
         "<div id='m1'>"
         "<span id='m10'>m10</span>"
         "<span id='m11'>m11</span>"
         "</div>"
         "<div id='m2'>m2</div>";
     const char* shadowHTML1 =
         "<div id='s1'>"
         "<content></content>"
         "</div>";
 
     setupSampleHTML(mainHTML, shadowHTML1, 1);
 
     const char* shadowHTML2 =
         "<div id='s2'>"
         "<content select='#m10'></content>"
         "<span id='s21'>s21</span>"
         "</div>";
 
-    RefPtrWillBeRawPtr<Element> body = document().body();
-    RefPtrWillBeRawPtr<Element> m1 = body->querySelector("#m1", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> m10 = body->querySelector("#m10", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> body = document().body();
+    RawPtr<Element> m1 = body->querySelector("#m1", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> m10 = body->querySelector("#m10", ASSERT_NO_EXCEPTION);
 
-    RefPtrWillBeRawPtr<ShadowRoot> shadowRoot1 = m1->openShadowRoot();
-    RefPtrWillBeRawPtr<Element> s1 = shadowRoot1->querySelector("#s1", ASSERT_NO_EXCEPTION);
+    RawPtr<ShadowRoot> shadowRoot1 = m1->openShadowRoot();
+    RawPtr<Element> s1 = shadowRoot1->querySelector("#s1", ASSERT_NO_EXCEPTION);
 
     attachV0ShadowRoot(*s1, shadowHTML2);
 
-    RefPtrWillBeRawPtr<ShadowRoot> shadowRoot2 = s1->openShadowRoot();
-    RefPtrWillBeRawPtr<Element> s21 = shadowRoot2->querySelector("#s21", ASSERT_NO_EXCEPTION);
+    RawPtr<ShadowRoot> shadowRoot2 = s1->openShadowRoot();
+    RawPtr<Element> s21 = shadowRoot2->querySelector("#s21", ASSERT_NO_EXCEPTION);
 
     EXPECT_EQ(s21.get(), FlatTreeTraversal::nextSibling(*m10));
     EXPECT_EQ(m10.get(), FlatTreeTraversal::previousSibling(*s21));
 
     // FlatTreeTraversal::traverseSiblings does not work for a node which is not in a document flat tree.
     // e.g. The following test fails. The result of FlatTreeTraversal::previousSibling(*m11)) will be #m10, instead of nullptr.
-    // RefPtrWillBeRawPtr<Element> m11 = body->querySelector("#m11", ASSERT_NO_EXCEPTION);
+    // RawPtr<Element> m11 = body->querySelector("#m11", ASSERT_NO_EXCEPTION);
     // EXPECT_EQ(nullptr, FlatTreeTraversal::previousSibling(*m11));
 }
 
 TEST_F(FlatTreeTraversalTest, v1Simple)
 {
     const char* mainHTML =
         "<div id='host'>"
         "<div id='child1' slot='slot1'></div>"
         "<div id='child2' slot='slot2'></div>"
         "</div>";
     const char* shadowHTML =
         "<div id='shadow-child1'></div>"
         "<slot name='slot1'></slot>"
         "<slot name='slot2'></slot>"
         "<div id='shadow-child2'></div>";
 
     setupDocumentTree(mainHTML);
-    RefPtrWillBeRawPtr<Element> body = document().body();
-    RefPtrWillBeRawPtr<Element> host = body->querySelector("#host", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> child1 = body->querySelector("#child1", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> child2 = body->querySelector("#child2", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> body = document().body();
+    RawPtr<Element> host = body->querySelector("#host", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> child1 = body->querySelector("#child1", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> child2 = body->querySelector("#child2", ASSERT_NO_EXCEPTION);
 
     attachOpenShadowRoot(*host, shadowHTML);
-    RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = host->openShadowRoot();
-    RefPtrWillBeRawPtr<Element> slot1 = shadowRoot->querySelector("[name=slot1]", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> slot2 = shadowRoot->querySelector("[name=slot2]", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> shadowChild1 = shadowRoot->querySelector("#shadow-child1", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> shadowChild2 = shadowRoot->querySelector("#shadow-child2", ASSERT_NO_EXCEPTION);
+    RawPtr<ShadowRoot> shadowRoot = host->openShadowRoot();
+    RawPtr<Element> slot1 = shadowRoot->querySelector("[name=slot1]", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> slot2 = shadowRoot->querySelector("[name=slot2]", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> shadowChild1 = shadowRoot->querySelector("#shadow-child1", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> shadowChild2 = shadowRoot->querySelector("#shadow-child2", ASSERT_NO_EXCEPTION);
 
     EXPECT_TRUE(slot1);
     EXPECT_TRUE(slot2);
     EXPECT_EQ(shadowChild1.get(), FlatTreeTraversal::firstChild(*host));
     EXPECT_EQ(child1.get(), FlatTreeTraversal::nextSibling(*shadowChild1));
     EXPECT_EQ(child2.get(), FlatTreeTraversal::nextSibling(*child1));
     EXPECT_EQ(shadowChild2.get(), FlatTreeTraversal::nextSibling(*child2));
 }
 
 TEST_F(FlatTreeTraversalTest, v1Redistribution)
@@ skipping 16 matching lines @@
         "<div id='d1-4' slot='d1-1-s1'></div>"
         "</div>";
     const char* shadowHTML2 =
         "<div id='d1-1-1'></div>"
         "<slot name='d1-1-s1'></slot>"
         "<slot name='d1-1-s2'></slot>"
         "<div id='d1-1-2'></div>";
 
     setupDocumentTree(mainHTML);
 
-    RefPtrWillBeRawPtr<Element> body = document().body();
-    RefPtrWillBeRawPtr<Element> d1 = body->querySelector("#d1", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> d2 = body->querySelector("#d2", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> d3 = body->querySelector("#d3", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> d4 = body->querySelector("#d4", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> d5 = body->querySelector("#d5", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> d6 = body->querySelector("#d6", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> body = document().body();
+    RawPtr<Element> d1 = body->querySelector("#d1", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> d2 = body->querySelector("#d2", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> d3 = body->querySelector("#d3", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> d4 = body->querySelector("#d4", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> d5 = body->querySelector("#d5", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> d6 = body->querySelector("#d6", ASSERT_NO_EXCEPTION);
 
     attachOpenShadowRoot(*d1, shadowHTML1);
-    RefPtrWillBeRawPtr<ShadowRoot> shadowRoot1 = d1->openShadowRoot();
-    RefPtrWillBeRawPtr<Element> d11 = shadowRoot1->querySelector("#d1-1", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> d12 = shadowRoot1->querySelector("#d1-2", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> d13 = shadowRoot1->querySelector("#d1-3", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> d14 = shadowRoot1->querySelector("#d1-4", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> d1s0 = shadowRoot1->querySelector("#d1-s0", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> d1s1 = shadowRoot1->querySelector("[name=d1-s1]", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> d1s2 = shadowRoot1->querySelector("[name=d1-s2]", ASSERT_NO_EXCEPTION);
+    RawPtr<ShadowRoot> shadowRoot1 = d1->openShadowRoot();
+    RawPtr<Element> d11 = shadowRoot1->querySelector("#d1-1", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> d12 = shadowRoot1->querySelector("#d1-2", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> d13 = shadowRoot1->querySelector("#d1-3", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> d14 = shadowRoot1->querySelector("#d1-4", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> d1s0 = shadowRoot1->querySelector("#d1-s0", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> d1s1 = shadowRoot1->querySelector("[name=d1-s1]", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> d1s2 = shadowRoot1->querySelector("[name=d1-s2]", ASSERT_NO_EXCEPTION);
 
     attachOpenShadowRoot(*d11, shadowHTML2);
-    RefPtrWillBeRawPtr<ShadowRoot> shadowRoot2 = d11->openShadowRoot();
-    RefPtrWillBeRawPtr<Element> d111 = shadowRoot2->querySelector("#d1-1-1", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> d112 = shadowRoot2->querySelector("#d1-1-2", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> d11s1 = shadowRoot2->querySelector("[name=d1-1-s1]", ASSERT_NO_EXCEPTION);
-    RefPtrWillBeRawPtr<Element> d11s2 = shadowRoot2->querySelector("[name=d1-1-s2]", ASSERT_NO_EXCEPTION);
+    RawPtr<ShadowRoot> shadowRoot2 = d11->openShadowRoot();
+    RawPtr<Element> d111 = shadowRoot2->querySelector("#d1-1-1", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> d112 = shadowRoot2->querySelector("#d1-1-2", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> d11s1 = shadowRoot2->querySelector("[name=d1-1-s1]", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> d11s2 = shadowRoot2->querySelector("[name=d1-1-s2]", ASSERT_NO_EXCEPTION);
 
     EXPECT_TRUE(d5);
     EXPECT_TRUE(d12);
     EXPECT_TRUE(d13);
     EXPECT_TRUE(d1s0);
     EXPECT_TRUE(d1s1);
     EXPECT_TRUE(d1s2);
     EXPECT_TRUE(d11s1);
     EXPECT_TRUE(d11s2);
     EXPECT_EQ(d11.get(), FlatTreeTraversal::next(*d1));
     EXPECT_EQ(d111.get(), FlatTreeTraversal::next(*d11));
     EXPECT_EQ(d2.get(), FlatTreeTraversal::next(*d111));
     EXPECT_EQ(d14.get(), FlatTreeTraversal::next(*d2));
     EXPECT_EQ(d112.get(), FlatTreeTraversal::next(*d14));
     EXPECT_EQ(d6.get(), FlatTreeTraversal::next(*d112));
 
     EXPECT_EQ(d112.get(), FlatTreeTraversal::previous(*d6));
 
     EXPECT_EQ(d11.get(), FlatTreeTraversal::parent(*d111));
     EXPECT_EQ(d11.get(), FlatTreeTraversal::parent(*d112));
     EXPECT_EQ(d11.get(), FlatTreeTraversal::parent(*d2));
     EXPECT_EQ(d11.get(), FlatTreeTraversal::parent(*d14));
     EXPECT_EQ(nullptr, FlatTreeTraversal::parent(*d3));
     EXPECT_EQ(nullptr, FlatTreeTraversal::parent(*d4));
 }
 
 } // namespace blink