[WIP] Clean up DocumentMarkerController API

third_party/WebKit/Source/core/editing/markers/DocumentMarkerControllerTest.cpp

 /*
  * Copyright (c) 2013, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 170 matching lines @@
   // No more reference to marked node.
   ThreadState::current()->collectAllGarbage();
   EXPECT_EQ(0u, markerController().markers().size());
 }
 
 TEST_F(DocumentMarkerControllerTest, UpdateRenderedRects) {
   setBodyInnerHTML("<div style='margin: 100px'>foo</div>");
   Element* div = toElement(document().body()->firstChild());
   markNodeContents(div);
   Vector<IntRect> renderedRects =
-      markerController().renderedRectsForMarkers(DocumentMarker::TextMatch);
+      markerController().renderedRectsForTextMatchMarkers();
   EXPECT_EQ(1u, renderedRects.size());
 
   div->setAttribute(HTMLNames::styleAttr, "margin: 200px");
   document().updateStyleAndLayout();
   Vector<IntRect> newRenderedRects =
-      markerController().renderedRectsForMarkers(DocumentMarker::TextMatch);
+      markerController().renderedRectsForTextMatchMarkers();
   EXPECT_EQ(1u, newRenderedRects.size());
   EXPECT_NE(renderedRects[0], newRenderedRects[0]);
 }
 
 TEST_F(DocumentMarkerControllerTest, CompositionMarkersNotMerged) {
   setBodyInnerHTML("<div style='margin: 100px'>foo</div>");
   Node* text = document().body()->firstChild()->firstChild();
   document().updateStyleAndLayout();
   markerController().addCompositionMarker(Position(text, 0), Position(text, 1),
                                           Color::black, false, Color::black);
   markerController().addCompositionMarker(Position(text, 1), Position(text, 3),
                                           Color::black, true, Color::black);
 
   EXPECT_EQ(2u, markerController().markers().size());
 }
 
 TEST_F(DocumentMarkerControllerTest, SetMarkerActiveTest) {
   setBodyInnerHTML("<b>foo</b>");
   document().updateStyleAndLayout();
   Element* bElement = toElement(document().body()->firstChild());
   EphemeralRange ephemeralRange = EphemeralRange::rangeOfContents(*bElement);
   Position startBElement = toPositionInDOMTree(ephemeralRange.startPosition());
   Position endBElement = toPositionInDOMTree(ephemeralRange.endPosition());
   const EphemeralRange range(startBElement, endBElement);
   // Try to make active a marker that doesn't exist.
-  EXPECT_FALSE(markerController().setMarkersActive(range, true));
+  EXPECT_FALSE(markerController().setTextMatchMarkersActive(range, true));
 
   // Add a marker and try it once more.
   markerController().addTextMatchMarker(range, false);
   EXPECT_EQ(1u, markerController().markers().size());
-  EXPECT_TRUE(markerController().setMarkersActive(range, true));
+  EXPECT_TRUE(markerController().setTextMatchMarkersActive(range, true));
 }
 
 }  // namespace blink