Get rid of flat tree version of createVisibleSelection() taking two PositionInFlatTree

third_party/WebKit/Source/core/editing/VisibleSelectionTest.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/VisibleSelection.h"
 
 #include "core/dom/Range.h"
 #include "core/editing/EditingTestBase.h"
 #include "core/editing/SelectionAdjuster.h"
 
@@ skipping 197 matching lines @@
   ShadowRoot* shadowRoot = setShadowContent(shadowContent, "host");
 
   Element* body = document().body();
   Element* host = body->querySelector("#host");
   Element* one = body->querySelector("#one");
   Element* six = shadowRoot->querySelector("#s6");
 
   VisibleSelection selection =
       createVisibleSelection(Position::firstPositionInNode(one),
                              Position::lastPositionInNode(shadowRoot));
-  VisibleSelectionInFlatTree selectionInFlatTree =
-      createVisibleSelection(PositionInFlatTree::firstPositionInNode(one),
-                             PositionInFlatTree::lastPositionInNode(host));
+  VisibleSelectionInFlatTree selectionInFlatTree = createVisibleSelection(
+      SelectionInFlatTree::Builder()
+          .collapse(PositionInFlatTree::firstPositionInNode(one))
+          .extend(PositionInFlatTree::lastPositionInNode(host))
+          .build());
 
   EXPECT_EQ(Position(host, PositionAnchorType::BeforeAnchor),
             selection.start());
   EXPECT_EQ(Position(one->firstChild(), 0), selection.end());
   EXPECT_EQ(PositionInFlatTree(one->firstChild(), 0),
             selectionInFlatTree.start());
   EXPECT_EQ(PositionInFlatTree(six->firstChild(), 2),
             selectionInFlatTree.end());
 }
 
 TEST_F(VisibleSelectionTest, ShadowV0DistributedNodes) {
   const char* bodyContent =
       "<p id='host'>00<b id='one'>11</b><b id='two'>22</b>33</p>";
   const char* shadowContent =
       "<a><span id='s4'>44</span><content select=#two></content><span "
       "id='s5'>55</span><content select=#one></content><span "
       "id='s6'>66</span></a>";
   setBodyContent(bodyContent);
   ShadowRoot* shadowRoot = setShadowContent(shadowContent, "host");
 
   Element* body = document().body();
   Element* one = body->querySelector("#one");
   Element* two = body->querySelector("#two");
   Element* five = shadowRoot->querySelector("#s5");
 
   VisibleSelection selection = createVisibleSelection(
       Position::firstPositionInNode(one), Position::lastPositionInNode(two));
-  VisibleSelectionInFlatTree selectionInFlatTree =
-      createVisibleSelection(PositionInFlatTree::firstPositionInNode(one),
-                             PositionInFlatTree::lastPositionInNode(two));
+  VisibleSelectionInFlatTree selectionInFlatTree = createVisibleSelection(
+      SelectionInFlatTree::Builder()
+          .collapse(PositionInFlatTree::firstPositionInNode(one))
+          .extend(PositionInFlatTree::lastPositionInNode(two))
+          .build());
 
   EXPECT_EQ(Position(one->firstChild(), 0), selection.start());
   EXPECT_EQ(Position(two->firstChild(), 2), selection.end());
   EXPECT_EQ(PositionInFlatTree(five->firstChild(), 0),
             selectionInFlatTree.start());
   EXPECT_EQ(PositionInFlatTree(five->firstChild(), 2),
             selectionInFlatTree.end());
 }
 
 TEST_F(VisibleSelectionTest, ShadowNested) {
@@ skipping 19 matching lines @@
   //    <span id="s6">66</span>
   //  </p>
   Element* body = document().body();
   Element* host = body->querySelector("#host");
   Element* one = body->querySelector("#one");
   Element* eight = shadowRoot2->querySelector("#s8");
 
   VisibleSelection selection =
       createVisibleSelection(Position::firstPositionInNode(one),
                              Position::lastPositionInNode(shadowRoot2));
-  VisibleSelectionInFlatTree selectionInFlatTree =
-      createVisibleSelection(PositionInFlatTree::firstPositionInNode(one),
-                             PositionInFlatTree::afterNode(eight));
+  VisibleSelectionInFlatTree selectionInFlatTree = createVisibleSelection(
+      SelectionInFlatTree::Builder()
+          .collapse(PositionInFlatTree::firstPositionInNode(one))
+          .extend(PositionInFlatTree::afterNode(eight))
+          .build());
 
   EXPECT_EQ(Position(host, PositionAnchorType::BeforeAnchor),
             selection.start());
   EXPECT_EQ(Position(one->firstChild(), 0), selection.end());
   EXPECT_EQ(PositionInFlatTree(eight->firstChild(), 2),
             selectionInFlatTree.start());
   EXPECT_EQ(PositionInFlatTree(eight->firstChild(), 2),
             selectionInFlatTree.end());
 }
 
@@ skipping 134 matching lines @@
   selection.updateIfNeeded();
   EXPECT_EQ(Position(sample->firstChild(), 0), selection.start());
 
   VisibleSelectionInFlatTree selectionInFlatTree;
   SelectionAdjuster::adjustSelectionInFlatTree(&selectionInFlatTree, selection);
   EXPECT_EQ(PositionInFlatTree(sample->firstChild(), 0),
             selectionInFlatTree.start());
 }
 
 }  // namespace blink