Prune CreateVisibleSelectionDeprecated from unit test files

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

Index: third_party/WebKit/Source/core/editing/FrameSelectionTest.cpp
diff --git a/third_party/WebKit/Source/core/editing/FrameSelectionTest.cpp b/third_party/WebKit/Source/core/editing/FrameSelectionTest.cpp
index bd26a52ff60e91fde2c00e5b7d8636207d3ff230..bc1567b58e5dd29d9c72453f62aafd9ff2a34a16 100644
--- a/third_party/WebKit/Source/core/editing/FrameSelectionTest.cpp
+++ b/third_party/WebKit/Source/core/editing/FrameSelectionTest.cpp
@@ -68,7 +68,8 @@ Text* FrameSelectionTest::appendTextNode(const String& data)
 TEST_F(FrameSelectionTest, SetValidSelection)
 {
     Text* text = appendTextNode("Hello, World!");
-    VisibleSelection validSelection = createVisibleSelectionDeprecated(Position(text, 0), Position(text, 5));
+    document().view()->updateAllLifecyclePhases();
+    VisibleSelection validSelection = createVisibleSelection(Position(text, 0), Position(text, 5));
     EXPECT_FALSE(validSelection.isNone());
     setSelection(validSelection);
     EXPECT_FALSE(selection().isNone());
@@ -79,7 +80,7 @@ TEST_F(FrameSelectionTest, InvalidateCaretRect)
     Text* text = appendTextNode("Hello, World!");
     document().view()->updateAllLifecyclePhases();
 
-    VisibleSelection validSelection = createVisibleSelectionDeprecated(Position(text, 0), Position(text, 0));
+    VisibleSelection validSelection = createVisibleSelection(Position(text, 0), Position(text, 0));
     setSelection(validSelection);
     selection().setCaretRectNeedsUpdate();
     EXPECT_TRUE(selection().isCaretBoundsDirty());
@@ -103,7 +104,7 @@ TEST_F(FrameSelectionTest, PaintCaretShouldNotLayout)
     document().body()->focus();
     EXPECT_TRUE(document().body()->focused());
 
-    VisibleSelection validSelection = createVisibleSelectionDeprecated(Position(text, 0), Position(text, 0));
+    VisibleSelection validSelection = createVisibleSelection(Position(text, 0), Position(text, 0));
     selection().setCaretVisible(true);
     setSelection(validSelection);
     EXPECT_TRUE(selection().isCaret());
@@ -207,7 +208,7 @@ TEST_F(FrameSelectionTest, ModifyExtendWithFlatTree)
     Node* const two = FlatTreeTraversal::firstChild(*host);
     // Select "two" for selection in DOM tree
     // Select "twoone" for selection in Flat tree
-    selection().setSelection(createVisibleSelectionDeprecated(PositionInFlatTree(host, 0), PositionInFlatTree(document().body(), 2)));
+    selection().setSelection(createVisibleSelection(PositionInFlatTree(host, 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());
@@ -220,7 +221,7 @@ TEST_F(FrameSelectionTest, ModifyWithUserTriggered)
     setBodyContent("<div id=sample>abc</div>");
     Element* sample = document().getElementById("sample");
     const Position endOfText(sample->firstChild(), 3);
-    selection().setSelection(createVisibleSelectionDeprecated(endOfText));
+    selection().setSelection(createVisibleSelection(endOfText));
 
     EXPECT_FALSE(selection().modify(FrameSelection::AlterationMove, DirectionForward, CharacterGranularity, NotUserTriggered))
         << "Selection.modify() returns false for non-user-triggered call when selection isn't modified.";
@@ -240,7 +241,7 @@ TEST_F(FrameSelectionTest, MoveRangeSelectionTest)
     updateAllLifecyclePhases();
 
     // Itinitializes with "Foo B|a>r Baz," (| means start and > means end).
-    selection().setSelection(createVisibleSelectionDeprecated(Position(text, 5), Position(text, 6)));
+    selection().setSelection(createVisibleSelection(Position(text, 5), Position(text, 6)));
     EXPECT_EQ_SELECTED_TEXT("a");
 
     // "Foo B|ar B>az," with the Character granularity.
@@ -269,7 +270,7 @@ TEST_F(FrameSelectionTest, setNonDirectionalSelectionIfNeeded)
     Node* host = document().getElementById("host");
 
     // top to bottom
-    selection().setNonDirectionalSelectionIfNeeded(createVisibleSelectionDeprecated(PositionInFlatTree(top, 1), PositionInFlatTree(bottom, 3)), CharacterGranularity);
+    selection().setNonDirectionalSelectionIfNeeded(createVisibleSelection(PositionInFlatTree(top, 1), PositionInFlatTree(bottom, 3)), CharacterGranularity);
     EXPECT_EQ(Position(top, 1), visibleSelectionInDOMTree().base());
     EXPECT_EQ(Position::beforeNode(host), visibleSelectionInDOMTree().extent());
     EXPECT_EQ(Position(top, 1), visibleSelectionInDOMTree().start());
@@ -281,7 +282,7 @@ TEST_F(FrameSelectionTest, setNonDirectionalSelectionIfNeeded)
     EXPECT_EQ(PositionInFlatTree(bottom, 3), visibleSelectionInFlatTree().end());
 
     // bottom to top
-    selection().setNonDirectionalSelectionIfNeeded(createVisibleSelectionDeprecated(PositionInFlatTree(bottom, 3), PositionInFlatTree(top, 1)), CharacterGranularity);
+    selection().setNonDirectionalSelectionIfNeeded(createVisibleSelection(PositionInFlatTree(bottom, 3), PositionInFlatTree(top, 1)), CharacterGranularity);
     EXPECT_EQ(Position(bottom, 3), visibleSelectionInDOMTree().base());
     EXPECT_EQ(Position::beforeNode(bottom->parentNode()), visibleSelectionInDOMTree().extent());
     EXPECT_EQ(Position(bottom, 0), visibleSelectionInDOMTree().start());
@@ -305,8 +306,9 @@ TEST_F(FrameSelectionTest, updateIfNeededAndFrameCaret)
 {
     setBodyContent("<style id=sample></style>");
     document().setDesignMode("on");
+    updateAllLifecyclePhases();
     Element* sample = document().getElementById("sample");
-    setSelection(createVisibleSelectionDeprecated(Position(sample, 0)));
+    setSelection(createVisibleSelection(Position(sample, 0)));
     EXPECT_EQ(Position(document().body(), 0), selection().start());
     EXPECT_EQ(selection().start(), caretPosition().position());
     document().body()->remove();