Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/core/editing/FrameSelectionTest.cpp

 // 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.
 
 #include "core/editing/FrameSelection.h"
 
 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/dom/Text.h"
@@ skipping 15 matching lines @@
 
 namespace blink {
 
 class FrameSelectionTest : public EditingTestBase {
 protected:
     void setSelection(const VisibleSelection&);
     FrameSelection& selection() const;
     const VisibleSelection& visibleSelectionInDOMTree() const { return selection().selection(); }
     const VisibleSelectionInFlatTree& visibleSelectionInFlatTree() const { return selection().selectionInFlatTree(); }
 
-    PassRefPtrWillBeRawPtr<Text> appendTextNode(const String& data);
+    RawPtr<Text> appendTextNode(const String& data);
     int layoutCount() const { return dummyPageHolder().frameView().layoutCount(); }
 
     bool shouldPaintCaretForTesting() const { return selection().shouldPaintCaretForTesting(); }
     bool isPreviousCaretDirtyForTesting() const { return selection().isPreviousCaretDirtyForTesting(); }
 
 private:
-    RefPtrWillBePersistent<Text> m_textNode;
+    Persistent<Text> m_textNode;
 };
 
 void FrameSelectionTest::setSelection(const VisibleSelection& newSelection)
 {
     dummyPageHolder().frame().selection().setSelection(newSelection);
 }
 
 FrameSelection& FrameSelectionTest::selection() const
 {
     return dummyPageHolder().frame().selection();
 }
 
-PassRefPtrWillBeRawPtr<Text> FrameSelectionTest::appendTextNode(const String& data)
+RawPtr<Text> FrameSelectionTest::appendTextNode(const String& data)
 {
-    RefPtrWillBeRawPtr<Text> text = document().createTextNode(data);
+    RawPtr<Text> text = document().createTextNode(data);
     document().body()->appendChild(text);
     return text.release();
 }
 
 TEST_F(FrameSelectionTest, SetValidSelection)
 {
-    RefPtrWillBeRawPtr<Text> text = appendTextNode("Hello, World!");
+    RawPtr<Text> text = appendTextNode("Hello, World!");
     VisibleSelection validSelection(Position(text, 0), Position(text, 5));
     EXPECT_FALSE(validSelection.isNone());
     setSelection(validSelection);
     EXPECT_FALSE(selection().isNone());
 }
 
 TEST_F(FrameSelectionTest, SetInvalidSelection)
 {
     // Create a new document without frame by using DOMImplementation.
     DocumentInit dummy;
-    RefPtrWillBeRawPtr<Document> documentWithoutFrame = Document::create();
-    RefPtrWillBeRawPtr<Element> body = HTMLBodyElement::create(*documentWithoutFrame);
+    RawPtr<Document> documentWithoutFrame = Document::create();
+    RawPtr<Element> body = HTMLBodyElement::create(*documentWithoutFrame);
     documentWithoutFrame->appendChild(body);
-    RefPtrWillBeRawPtr<Text> anotherText = documentWithoutFrame->createTextNode("Hello, another world");
+    RawPtr<Text> anotherText = documentWithoutFrame->createTextNode("Hello, another world");
     body->appendChild(anotherText);
 
     // Create a new VisibleSelection for the new document without frame and
     // update FrameSelection with the selection.
     VisibleSelection invalidSelection;
     invalidSelection.setWithoutValidation(Position(anotherText, 0), Position(anotherText, 5));
     setSelection(invalidSelection);
 
     EXPECT_TRUE(selection().isNone());
 }
 
 TEST_F(FrameSelectionTest, InvalidateCaretRect)
 {
-    RefPtrWillBeRawPtr<Text> text = appendTextNode("Hello, World!");
+    RawPtr<Text> text = appendTextNode("Hello, World!");
     document().view()->updateAllLifecyclePhases();
 
     VisibleSelection validSelection(Position(text, 0), Position(text, 0));
     setSelection(validSelection);
     selection().setCaretRectNeedsUpdate();
     EXPECT_TRUE(selection().isCaretBoundsDirty());
     selection().invalidateCaretRect();
     EXPECT_FALSE(selection().isCaretBoundsDirty());
 
     document().body()->removeChild(text);
     document().updateLayoutIgnorePendingStylesheets();
     selection().setCaretRectNeedsUpdate();
     EXPECT_TRUE(selection().isCaretBoundsDirty());
     selection().invalidateCaretRect();
     EXPECT_FALSE(selection().isCaretBoundsDirty());
 }
 
 TEST_F(FrameSelectionTest, PaintCaretShouldNotLayout)
 {
-    RefPtrWillBeRawPtr<Text> text = appendTextNode("Hello, World!");
+    RawPtr<Text> text = appendTextNode("Hello, World!");
     document().view()->updateAllLifecyclePhases();
 
     document().body()->setContentEditable("true", ASSERT_NO_EXCEPTION);
     document().body()->focus();
     EXPECT_TRUE(document().body()->focused());
 
     VisibleSelection validSelection(Position(text, 0), Position(text, 0));
     selection().setCaretVisible(true);
     setSelection(validSelection);
     EXPECT_TRUE(selection().isCaret());
@@ skipping 10 matching lines @@
     }
     OwnPtr<PaintController> paintController = PaintController::create();
     GraphicsContext context(*paintController);
     DrawingRecorder drawingRecorder(context, *dummyPageHolder().frameView().layoutView(), DisplayItem::Caret, LayoutRect::infiniteIntRect());
     selection().paintCaret(context, LayoutPoint());
     EXPECT_EQ(startCount, layoutCount());
 }
 
 TEST_F(FrameSelectionTest, InvalidatePreviousCaretAfterRemovingLastCharacter)
 {
-    RefPtrWillBeRawPtr<Text> text = appendTextNode("Hello, World!");
+    RawPtr<Text> text = appendTextNode("Hello, World!");
     document().view()->updateAllLifecyclePhases();
 
     document().body()->setContentEditable("true", ASSERT_NO_EXCEPTION);
     document().body()->focus();
     EXPECT_TRUE(document().body()->focused());
 
     selection().setCaretVisible(true);
     EXPECT_TRUE(selection().isCaret());
     EXPECT_TRUE(shouldPaintCaretForTesting());
 
@@ skipping 31 matching lines @@
     EXPECT_FALSE(selection().isCaretBoundsDirty());
     EXPECT_TRUE(isPreviousCaretDirtyForTesting());
 }
 
 #define EXPECT_EQ_SELECTED_TEXT(text) \
     EXPECT_EQ(text, WebString(selection().selectedText()).utf8())
 
 TEST_F(FrameSelectionTest, SelectWordAroundPosition)
 {
     // "Foo Bar  Baz,"
-    RefPtrWillBeRawPtr<Text> text = appendTextNode("Foo Bar&nbsp;&nbsp;Baz,");
+    RawPtr<Text> text = appendTextNode("Foo Bar&nbsp;&nbsp;Baz,");
     // "Fo|o Bar  Baz,"
     EXPECT_TRUE(selection().selectWordAroundPosition(createVisiblePosition(Position(text, 2))));
     EXPECT_EQ_SELECTED_TEXT("Foo");
     // "Foo| Bar  Baz,"
     EXPECT_TRUE(selection().selectWordAroundPosition(createVisiblePosition(Position(text, 3))));
     EXPECT_EQ_SELECTED_TEXT("Foo");
     // "Foo Bar | Baz,"
     EXPECT_FALSE(selection().selectWordAroundPosition(createVisiblePosition(Position(text, 13))));
     // "Foo Bar  Baz|,"
     EXPECT_TRUE(selection().selectWordAroundPosition(createVisiblePosition(Position(text, 22))));
     EXPECT_EQ_SELECTED_TEXT("Baz");
 }
 
 TEST_F(FrameSelectionTest, ModifyExtendWithFlatTree)
 {
     setBodyContent("<span id=host></span>one");
     setShadowContent("two<content></content>", "host");
     updateLayoutAndStyleForPainting();
-    RefPtrWillBeRawPtr<Element> host = document().getElementById("host");
+    RawPtr<Element> host = document().getElementById("host");
     Node* const two = FlatTreeTraversal::firstChild(*host);
     // Select "two" for selection in DOM tree
     // Select "twoone" for selection in Flat tree
     selection().setSelection(VisibleSelectionInFlatTree(PositionInFlatTree(host.get(), 0), PositionInFlatTree(document().body(), 2)));
     selection().modify(FrameSelection::AlterationExtend, DirectionForward, WordGranularity);
     EXPECT_EQ(Position(two, 0), visibleSelectionInDOMTree().start());
     EXPECT_EQ(Position(two, 3), visibleSelectionInDOMTree().end());
     EXPECT_EQ(PositionInFlatTree(two, 0), visibleSelectionInFlatTree().start());
     EXPECT_EQ(PositionInFlatTree(two, 3), visibleSelectionInFlatTree().end());
 }
 
 TEST_F(FrameSelectionTest, MoveRangeSelectionTest)
 {
     // "Foo Bar Baz,"
-    RefPtrWillBeRawPtr<Text> text = appendTextNode("Foo Bar Baz,");
+    RawPtr<Text> text = appendTextNode("Foo Bar Baz,");
     // Itinitializes with "Foo B|a>r Baz," (| means start and > means end).
     selection().setSelection(VisibleSelection(Position(text, 5), Position(text, 6)));
     EXPECT_EQ_SELECTED_TEXT("a");
 
     // "Foo B|ar B>az," with the Character granularity.
     selection().moveRangeSelection(createVisiblePosition(Position(text, 5)), createVisiblePosition(Position(text, 9)), CharacterGranularity);
     EXPECT_EQ_SELECTED_TEXT("ar B");
     // "Foo B|ar B>az," with the Word granularity.
     selection().moveRangeSelection(createVisiblePosition(Position(text, 5)), createVisiblePosition(Position(text, 9)), WordGranularity);
     EXPECT_EQ_SELECTED_TEXT("Bar Baz");
     // "Fo<o B|ar Baz," with the Character granularity.
     selection().moveRangeSelection(createVisiblePosition(Position(text, 5)), createVisiblePosition(Position(text, 2)), CharacterGranularity);
     EXPECT_EQ_SELECTED_TEXT("o B");
     // "Fo<o B|ar Baz," with the Word granularity.
     selection().moveRangeSelection(createVisiblePosition(Position(text, 5)), createVisiblePosition(Position(text, 2)), WordGranularity);
     EXPECT_EQ_SELECTED_TEXT("Foo Bar");
 }
 
 TEST_F(FrameSelectionTest, setNonDirectionalSelectionIfNeeded)
 {
     const char* bodyContent = "<span id=top>top</span><span id=host></span>";
     const char* shadowContent = "<span id=bottom>bottom</span>";
     setBodyContent(bodyContent);
-    RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = setShadowContent(shadowContent, "host");
+    RawPtr<ShadowRoot> shadowRoot = setShadowContent(shadowContent, "host");
     updateLayoutAndStyleForPainting();
 
     Node* top = document().getElementById("top")->firstChild();
     Node* bottom = shadowRoot->getElementById("bottom")->firstChild();
     Node* host = document().getElementById("host");
 
     // top to bottom
     selection().setNonDirectionalSelectionIfNeeded(VisibleSelectionInFlatTree(PositionInFlatTree(top, 1), PositionInFlatTree(bottom, 3)), CharacterGranularity);
     EXPECT_EQ(Position(top, 1), visibleSelectionInDOMTree().base());
     EXPECT_EQ(Position::beforeNode(host), visibleSelectionInDOMTree().extent());
@@ skipping 13 matching lines @@
     EXPECT_EQ(Position(bottom, 3), visibleSelectionInDOMTree().end());
 
     EXPECT_EQ(PositionInFlatTree(bottom, 3), visibleSelectionInFlatTree().base());
     EXPECT_EQ(PositionInFlatTree(top, 1), visibleSelectionInFlatTree().extent());
     EXPECT_EQ(PositionInFlatTree(top, 1), visibleSelectionInFlatTree().start());
     EXPECT_EQ(PositionInFlatTree(bottom, 3), visibleSelectionInFlatTree().end());
 }
 
 TEST_F(FrameSelectionTest, SelectAllWithUnselectableRoot)
 {
-    RefPtrWillBeRawPtr<Element> select = document().createElement("select", ASSERT_NO_EXCEPTION);
+    RawPtr<Element> select = document().createElement("select", ASSERT_NO_EXCEPTION);
     document().replaceChild(select.get(), document().documentElement());
     selection().selectAll();
     EXPECT_TRUE(selection().isNone()) << "Nothing should be selected if the content of the documentElement is not selctable.";
 }
 
 } // namespace blink