Prune createVisiblePositionDeprecated from unit tests

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 c408be7984e3533a36c221f4abaab5c61372436f..201b40e9297936a34a3ffcfe68895ea3cec1baa8 100644
--- a/third_party/WebKit/Source/core/editing/FrameSelectionTest.cpp
+++ b/third_party/WebKit/Source/core/editing/FrameSelectionTest.cpp
@@ -142,7 +142,8 @@ TEST_F(FrameSelectionTest, InvalidatePreviousCaretAfterRemovingLastCharacter)
 
     // Simulate to type "Hello, World!".
     DisableCompositingQueryAsserts disabler;
-    selection().moveTo(createVisiblePositionDeprecated(selection().end(), selection().affinity()), NotUserTriggered);
+    document().updateStyleAndLayout();
+    selection().moveTo(createVisiblePosition(selection().end(), selection().affinity()), NotUserTriggered);
     selection().setCaretRectNeedsUpdate();
     EXPECT_TRUE(selection().isCaretBoundsDirty());
     EXPECT_FALSE(isPreviousCaretDirtyForTesting());
@@ -152,7 +153,8 @@ TEST_F(FrameSelectionTest, InvalidatePreviousCaretAfterRemovingLastCharacter)
 
     // Simulate to remove all except for "H".
     text->replaceWholeText("H");
-    selection().moveTo(createVisiblePositionDeprecated(selection().end(), selection().affinity()), NotUserTriggered);
+    document().updateStyleAndLayout();
+    selection().moveTo(createVisiblePosition(selection().end(), selection().affinity()), NotUserTriggered);
     selection().setCaretRectNeedsUpdate();
     EXPECT_TRUE(selection().isCaretBoundsDirty());
     // "H" remains so early previousCaret invalidation isn't needed.
@@ -182,16 +184,18 @@ TEST_F(FrameSelectionTest, SelectWordAroundPosition)
 {
     // "Foo Bar  Baz,"
     Text* text = appendTextNode("Foo Bar  Baz,");
+    updateAllLifecyclePhases();
+
     // "Fo|o Bar  Baz,"
-    EXPECT_TRUE(selection().selectWordAroundPosition(createVisiblePositionDeprecated(Position(text, 2))));
+    EXPECT_TRUE(selection().selectWordAroundPosition(createVisiblePosition(Position(text, 2))));
     EXPECT_EQ_SELECTED_TEXT("Foo");
     // "Foo| Bar  Baz,"
-    EXPECT_TRUE(selection().selectWordAroundPosition(createVisiblePositionDeprecated(Position(text, 3))));
+    EXPECT_TRUE(selection().selectWordAroundPosition(createVisiblePosition(Position(text, 3))));
     EXPECT_EQ_SELECTED_TEXT("Foo");
     // "Foo Bar | Baz,"
-    EXPECT_FALSE(selection().selectWordAroundPosition(createVisiblePositionDeprecated(Position(text, 13))));
+    EXPECT_FALSE(selection().selectWordAroundPosition(createVisiblePosition(Position(text, 13))));
     // "Foo Bar  Baz|,"
-    EXPECT_TRUE(selection().selectWordAroundPosition(createVisiblePositionDeprecated(Position(text, 22))));
+    EXPECT_TRUE(selection().selectWordAroundPosition(createVisiblePosition(Position(text, 22))));
     EXPECT_EQ_SELECTED_TEXT("Baz");
 }
 
@@ -233,21 +237,23 @@ TEST_F(FrameSelectionTest, MoveRangeSelectionTest)
 {
     // "Foo Bar Baz,"
     Text* text = appendTextNode("Foo Bar Baz,");
+    updateAllLifecyclePhases();
+
     // 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(createVisiblePositionDeprecated(Position(text, 5)), createVisiblePositionDeprecated(Position(text, 9)), CharacterGranularity);
+    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(createVisiblePositionDeprecated(Position(text, 5)), createVisiblePositionDeprecated(Position(text, 9)), WordGranularity);
+    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(createVisiblePositionDeprecated(Position(text, 5)), createVisiblePositionDeprecated(Position(text, 2)), CharacterGranularity);
+    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(createVisiblePositionDeprecated(Position(text, 5)), createVisiblePositionDeprecated(Position(text, 2)), WordGranularity);
+    selection().moveRangeSelection(createVisiblePosition(Position(text, 5)), createVisiblePosition(Position(text, 2)), WordGranularity);
     EXPECT_EQ_SELECTED_TEXT("Foo Bar");
 }