Index: third_party/WebKit/Source/web/tests/WebFrameTest.cpp |
diff --git a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp |
index 7d90d5eebb902e2152207158bfe350be40685167..ea7cbccb36b5a6ff5c2debcf85e38485c6cd9152 100644 |
--- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp |
+++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp |
@@ -321,6 +321,15 @@ class WebFrameTest : public ::testing::Test { |
WebFrame* parent, |
WebFrame* new_child); |
+ int NumMarkersInRange(const Document* document, |
+ const EphemeralRange& range, |
+ DocumentMarker::MarkerTypes marker_types) { |
+ int node_count = 0; |
+ for (Node& node : range.Nodes()) |
+ node_count += document->Markers().MarkersFor(&node, marker_types).size(); |
+ return node_count; |
+ } |
+ |
std::string base_url_; |
std::string not_base_url_; |
std::string chrome_url_; |
@@ -6547,9 +6556,8 @@ TEST_P(ParameterizedWebFrameTest, ReplaceMisspelledRange) { |
.ToNormalizedEphemeralRange(); |
EXPECT_EQ(1, textcheck.NumberOfTimesChecked()); |
- EXPECT_EQ(1U, document->Markers() |
- .MarkersInRange(selection_range, DocumentMarker::kSpelling) |
- .size()); |
+ EXPECT_EQ(1, NumMarkersInRange(document, selection_range, |
+ DocumentMarker::kSpelling)); |
frame->ReplaceMisspelledRange("welcome"); |
EXPECT_EQ("_welcome_.", |
@@ -6596,9 +6604,8 @@ TEST_P(ParameterizedWebFrameTest, RemoveSpellingMarkers) { |
.ComputeVisibleSelectionInDOMTreeDeprecated() |
.ToNormalizedEphemeralRange(); |
- EXPECT_EQ(0U, document->Markers() |
- .MarkersInRange(selection_range, DocumentMarker::kSpelling) |
- .size()); |
+ EXPECT_EQ(0, NumMarkersInRange(document, selection_range, |
+ DocumentMarker::kSpelling)); |
} |
static void GetSpellingMarkerOffsets(WebVector<unsigned>* offsets, |