Change WebLocalFrame::SpellingMarkerOffsetsForTest to a local function in WebFrameTest

third_party/WebKit/Source/web/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 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 6540 matching lines @@
       frame->GetFrame()
           ->Selection()
           .ComputeVisibleSelectionInDOMTreeDeprecated()
           .ToNormalizedEphemeralRange();
 
   EXPECT_EQ(0U, document->Markers()
                     .MarkersInRange(selection_range, DocumentMarker::kSpelling)
                     .size());
 }
 
+static void GetSpellingMarkerOffsets(WebVector<unsigned>* offsets,
+                                     const Document& document) {
+  Vector<unsigned> result;
+  const DocumentMarkerVector& document_markers = document.Markers().Markers();
+  for (size_t i = 0; i < document_markers.size(); ++i)
+    result.push_back(document_markers[i]->StartOffset());
+  offsets->Assign(result);
+}
+
 TEST_P(ParameterizedWebFrameTest, RemoveSpellingMarkersUnderWords) {
   RegisterMockedHttpURLLoad("spell.html");
   FrameTestHelpers::WebViewHelper web_view_helper;
   InitializeTextSelectionWebView(base_url_ + "spell.html", &web_view_helper);
 
   WebLocalFrameImpl* web_frame = web_view_helper.WebView()->MainFrameImpl();
   TextCheckClient textcheck;
   web_frame->SetTextCheckClient(&textcheck);
 
   LocalFrame* frame = web_frame->GetFrame();
   Document* document = frame->GetDocument();
   Element* element = document->GetElementById("data");
 
   web_view_helper.WebView()->GetSettings()->SetEditingBehavior(
       WebSettings::kEditingBehaviorWin);
 
   element->focus();
   NonThrowableExceptionState exception_state;
   document->execCommand("InsertText", false, " wellcome ", exception_state);
   EXPECT_FALSE(exception_state.HadException());
 
   if (RuntimeEnabledFeatures::idleTimeSpellCheckingEnabled())
     frame->GetSpellChecker()
         .GetIdleSpellCheckCallback()
         .ForceInvocationForTesting();
 
   WebVector<unsigned> offsets1;
-  web_frame->SpellingMarkerOffsetsForTest(&offsets1);
+  GetSpellingMarkerOffsets(&offsets1, *frame->GetDocument());
   EXPECT_EQ(1U, offsets1.size());
 
   Vector<String> words;
   words.push_back("wellcome");
   frame->RemoveSpellingMarkersUnderWords(words);
 
   WebVector<unsigned> offsets2;
-  web_frame->SpellingMarkerOffsetsForTest(&offsets2);
+  GetSpellingMarkerOffsets(&offsets2, *frame->GetDocument());
   EXPECT_EQ(0U, offsets2.size());
 }
 
 class StubbornTextCheckClient : public WebTextCheckClient {
  public:
   StubbornTextCheckClient() : completion_(0) {}
   virtual ~StubbornTextCheckClient() {}
 
   virtual void RequestCheckingOfText(
       const WebString&,
@@ skipping 56 matching lines @@
   if (RuntimeEnabledFeatures::idleTimeSpellCheckingEnabled()) {
     document->GetFrame()
         ->GetSpellChecker()
         .GetIdleSpellCheckCallback()
         .ForceInvocationForTesting();
   }
 
   textcheck.Kick();
 
   WebVector<unsigned> offsets;
-  frame->SpellingMarkerOffsetsForTest(&offsets);
+  GetSpellingMarkerOffsets(&offsets, *frame->GetFrame()->GetDocument());
   EXPECT_EQ(0U, offsets.size());
 }
 
 // This test verifies that cancelling spelling request does not cause a
 // write-after-free when there's no spellcheck client set.
 TEST_P(ParameterizedWebFrameTest, CancelSpellingRequestCrash) {
   // The relevant code paths are obsolete with idle time spell checker.
   if (RuntimeEnabledFeatures::idleTimeSpellCheckingEnabled())
     return;
 
@@ skipping 5312 matching lines @@
 
   // Failing the original child frame navigation and trying to render fallback
   // content shouldn't crash. It should return NoLoadInProgress. This is so the
   // caller won't attempt to replace the correctly empty frame with an error
   // page.
   EXPECT_EQ(WebLocalFrame::NoLoadInProgress,
             child->MaybeRenderFallbackContent(WebURLError()));
 }
 
 }  // namespace blink