Remove DocumentMarkerController::MarkersInRange()

third_party/WebKit/Source/core/editing/InputMethodControllerTest.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/InputMethodController.h"
 
 #include <memory>
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/dom/Range.h"
@@ skipping 1390 matching lines @@
   Controller().FinishComposingText(InputMethodController::kKeepSelection);
   GetFrame().GetEditor().InsertLineBreak();
 
   Controller().SetCompositionFromExistingText(underlines, 8, 8);
 
   underlines.push_back(CompositionUnderline(0, 5, Color(255, 0, 0), false, 0));
   Controller().SetComposition(String("world"), underlines, 0, 0);
   ASSERT_EQ(1u, GetDocument().Markers().Markers().size());
 
   // Verify composition underline shows up on the second line, not the first
-  ASSERT_EQ(0u, GetDocument()
-                    .Markers()
-                    .MarkersInRange(PlainTextRange(0, 5).CreateRange(*div),
-                                    DocumentMarker::AllMarkers())
-                    .size());
-  ASSERT_EQ(1u, GetDocument()
-                    .Markers()
-                    .MarkersInRange(PlainTextRange(6, 11).CreateRange(*div),
-                                    DocumentMarker::AllMarkers())
-                    .size());
+  ASSERT_FALSE(
+      GetDocument()
+          .Markers()
+          .MarkerAtPosition(PlainTextRange(2).CreateRange(*div).StartPosition(),
+                            DocumentMarker::AllMarkers())
+          .has_value());
+  ASSERT_TRUE(
+      GetDocument()
+          .Markers()
+          .MarkerAtPosition(PlainTextRange(8).CreateRange(*div).StartPosition(),
+                            DocumentMarker::AllMarkers())
+          .has_value());
 
   // Verify marker has correct start/end offsets (measured from the beginning
   // of the node, which is the beginning of the line)
   EXPECT_EQ(0u, GetDocument().Markers().Markers()[0]->StartOffset());
   EXPECT_EQ(5u, GetDocument().Markers().Markers()[0]->EndOffset());
 }
 
 TEST_F(InputMethodControllerTest, SelectionWhenFocusChangeFinishesComposition) {
   GetDocument().GetSettings()->SetScriptEnabled(true);
   Element* editable =
@@ skipping 541 matching lines @@
   // Set selection before BODY(editable).
   GetFrame().Selection().SetSelection(
       SelectionInDOMTree::Builder()
           .Collapse(Position(GetDocument().documentElement(), 0))
           .Build());
 
   EXPECT_EQ(kWebTextInputTypeContentEditable, Controller().TextInputType());
 }
 
 }  // namespace blink