Prune createVisiblePositionDeprecated from unit tests

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 124 matching lines @@
     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());
 
     // 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());
     selection().invalidateCaretRect();
     EXPECT_FALSE(selection().isCaretBoundsDirty());
     EXPECT_TRUE(isPreviousCaretDirtyForTesting());
 
     // 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.
     EXPECT_TRUE(isPreviousCaretDirtyForTesting());
     selection().invalidateCaretRect();
     EXPECT_FALSE(selection().isCaretBoundsDirty());
     EXPECT_TRUE(isPreviousCaretDirtyForTesting());
 
     // Simulate to remove the last character.
     document().body()->removeChild(text);
     // This line is the objective of this test.
     // As removing the last character, early previousCaret invalidation is executed.
     EXPECT_FALSE(isPreviousCaretDirtyForTesting());
     document().updateStyleAndLayoutIgnorePendingStylesheets();
     selection().setCaretRectNeedsUpdate();
     EXPECT_TRUE(selection().isCaretBoundsDirty());
     EXPECT_FALSE(isPreviousCaretDirtyForTesting());
     selection().invalidateCaretRect();
     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,"
     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");
 }
 
 TEST_F(FrameSelectionTest, ModifyExtendWithFlatTree)
 {
     setBodyContent("<span id=host></span>one");
     setShadowContent("two<content></content>", "host");
     Element* host = document().getElementById("host");
     Node* const two = FlatTreeTraversal::firstChild(*host);
     // Select "two" for selection in DOM tree
@@ skipping 21 matching lines @@
     EXPECT_TRUE(selection().modify(FrameSelection::AlterationMove, DirectionForward, CharacterGranularity, UserTriggered))
         << "Selection.modify() returns true for user-triggered call";
     EXPECT_EQ(endOfText, selection().start())
         << "Selection isn't modified";
 }
 
 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");
 }
 
 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);
     ShadowRoot* shadowRoot = setShadowContent(shadowContent, "host");
 
@@ skipping 50 matching lines @@
     selection().updateIfNeeded();
 
     // TODO(yosin): Once lazy canonicalization implemented, selection.start
     // should be Position(HTML, 0).
     EXPECT_EQ(Position(), selection().start())
         << "updateIfNeeded() makes selection to null.";
     EXPECT_EQ(selection().start(), caretPosition().position());
 }
 
 } // namespace blink