Move WebTextCheckClient reference from WebViewImpl to WebLocalFrameImpl

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 6271 matching lines @@
   int numberOfTimesChecked() const { return m_numberOfTimesChecked; }
 
  private:
   int m_numberOfTimesChecked;
 };
 
 TEST_P(ParameterizedWebFrameTest, ReplaceMisspelledRange) {
   registerMockedHttpURLLoad("spell.html");
   FrameTestHelpers::WebViewHelper webViewHelper;
   initializeTextSelectionWebView(m_baseURL + "spell.html", &webViewHelper);
-  TextCheckClient textcheck;
-  webViewHelper.webView()->setTextCheckClient(&textcheck);
 
   WebLocalFrameImpl* frame = webViewHelper.webView()->mainFrameImpl();
+  TextCheckClient textcheck;
+  frame->setTextCheckClient(&textcheck);
+
   Document* document = frame->frame()->document();
   Element* element = document->getElementById("data");
 
   webViewHelper.webView()->settings()->setEditingBehavior(
       WebSettings::EditingBehaviorWin);
 
   element->focus();
   NonThrowableExceptionState exceptionState;
   document->execCommand("InsertText", false, "_wellcome_.", exceptionState);
   EXPECT_FALSE(exceptionState.hadException());
@@ skipping 23 matching lines @@
   EXPECT_EQ("_welcome_.",
             WebFrameContentDumper::dumpWebViewAsText(
                 webViewHelper.webView(), std::numeric_limits<size_t>::max())
                 .utf8());
 }
 
 TEST_P(ParameterizedWebFrameTest, RemoveSpellingMarkers) {
   registerMockedHttpURLLoad("spell.html");
   FrameTestHelpers::WebViewHelper webViewHelper;
   initializeTextSelectionWebView(m_baseURL + "spell.html", &webViewHelper);
-  TextCheckClient textcheck;
-  webViewHelper.webView()->setTextCheckClient(&textcheck);
 
   WebLocalFrameImpl* frame = webViewHelper.webView()->mainFrameImpl();
+  TextCheckClient textcheck;
+  frame->setTextCheckClient(&textcheck);
+
   Document* document = frame->frame()->document();
   Element* element = document->getElementById("data");
 
   webViewHelper.webView()->settings()->setEditingBehavior(
       WebSettings::EditingBehaviorWin);
 
   element->focus();
   NonThrowableExceptionState exceptionState;
   document->execCommand("InsertText", false, "_wellcome_.", exceptionState);
   EXPECT_FALSE(exceptionState.hadException());
@@ skipping 18 matching lines @@
 
   EXPECT_EQ(0U, document->markers()
                     .markersInRange(selectionRange, DocumentMarker::Spelling)
                     .size());
 }
 
 TEST_P(ParameterizedWebFrameTest, RemoveSpellingMarkersUnderWords) {
   registerMockedHttpURLLoad("spell.html");
   FrameTestHelpers::WebViewHelper webViewHelper;
   initializeTextSelectionWebView(m_baseURL + "spell.html", &webViewHelper);
+
+  WebLocalFrameImpl* webFrame = webViewHelper.webView()->mainFrameImpl();
   TextCheckClient textcheck;
-  webViewHelper.webView()->setTextCheckClient(&textcheck);
+  webFrame->setTextCheckClient(&textcheck);
 
-  LocalFrame* frame = webViewHelper.webView()->mainFrameImpl()->frame();
+  LocalFrame* frame = webFrame->frame();
   Document* document = frame->document();
   Element* element = document->getElementById("data");
 
   webViewHelper.webView()->settings()->setEditingBehavior(
       WebSettings::EditingBehaviorWin);
 
   element->focus();
   NonThrowableExceptionState exceptionState;
   document->execCommand("InsertText", false, " wellcome ", exceptionState);
   EXPECT_FALSE(exceptionState.hadException());
@@ skipping 53 matching lines @@
   }
 
   WebTextCheckingCompletion* m_completion;
 };
 
 TEST_P(ParameterizedWebFrameTest, SlowSpellcheckMarkerPosition) {
   registerMockedHttpURLLoad("spell.html");
   FrameTestHelpers::WebViewHelper webViewHelper;
   initializeTextSelectionWebView(m_baseURL + "spell.html", &webViewHelper);
 
+  WebLocalFrameImpl* frame = webViewHelper.webView()->mainFrameImpl();
   StubbornTextCheckClient textcheck;
-  webViewHelper.webView()->setTextCheckClient(&textcheck);
+  frame->setTextCheckClient(&textcheck);
 
-  WebLocalFrameImpl* frame = webViewHelper.webView()->mainFrameImpl();
   Document* document = frame->frame()->document();
   Element* element = document->getElementById("data");
 
   webViewHelper.webView()->settings()->setEditingBehavior(
       WebSettings::EditingBehaviorWin);
 
   element->focus();
   NonThrowableExceptionState exceptionState;
   document->execCommand("InsertText", false, "wellcome ", exceptionState);
   EXPECT_FALSE(exceptionState.hadException());
@@ skipping 17 matching lines @@
 // 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;
 
   registerMockedHttpURLLoad("spell.html");
   FrameTestHelpers::WebViewHelper webViewHelper;
   webViewHelper.initializeAndLoad(m_baseURL + "spell.html");
-  webViewHelper.webView()->setTextCheckClient(0);
 
   WebLocalFrameImpl* frame = webViewHelper.webView()->mainFrameImpl();
+  frame->setTextCheckClient(0);
+
   Document* document = frame->frame()->document();
   Element* element = document->getElementById("data");
 
   webViewHelper.webView()->settings()->setEditingBehavior(
       WebSettings::EditingBehaviorWin);
 
   element->focus();
   frame->frame()->editor().replaceSelectionWithText(
       "A", false, false, InputEvent::InputType::InsertReplacementText);
   frame->frame()->spellChecker().cancelCheck();
 }
 
 TEST_P(ParameterizedWebFrameTest, SpellcheckResultErasesMarkers) {
   registerMockedHttpURLLoad("spell.html");
   FrameTestHelpers::WebViewHelper webViewHelper;
   initializeTextSelectionWebView(m_baseURL + "spell.html", &webViewHelper);
 
+  WebLocalFrameImpl* frame = webViewHelper.webView()->mainFrameImpl();
   StubbornTextCheckClient textcheck;
-  webViewHelper.webView()->setTextCheckClient(&textcheck);
+  frame->setTextCheckClient(&textcheck);
 
-  WebLocalFrameImpl* frame = webViewHelper.webView()->mainFrameImpl();
   Document* document = frame->frame()->document();
   Element* element = document->getElementById("data");
 
   webViewHelper.webView()->settings()->setEditingBehavior(
       WebSettings::EditingBehaviorWin);
 
   element->focus();
   NonThrowableExceptionState exceptionState;
   document->execCommand("InsertText", false, "welcome ", exceptionState);
 
@@ skipping 16 matching lines @@
 
   textcheck.kickNoResults();
   EXPECT_EQ(0U, document->markers().markers().size());
 }
 
 TEST_P(ParameterizedWebFrameTest, SpellcheckResultsSavedInDocument) {
   registerMockedHttpURLLoad("spell.html");
   FrameTestHelpers::WebViewHelper webViewHelper;
   initializeTextSelectionWebView(m_baseURL + "spell.html", &webViewHelper);
 
+  WebLocalFrameImpl* frame = webViewHelper.webView()->mainFrameImpl();
   StubbornTextCheckClient textcheck;
-  webViewHelper.webView()->setTextCheckClient(&textcheck);
+  frame->setTextCheckClient(&textcheck);
 
-  WebLocalFrameImpl* frame = webViewHelper.webView()->mainFrameImpl();
   Document* document = frame->frame()->document();
   Element* element = document->getElementById("data");
 
   webViewHelper.webView()->settings()->setEditingBehavior(
       WebSettings::EditingBehaviorWin);
 
   element->focus();
   NonThrowableExceptionState exceptionState;
   document->execCommand("InsertText", false, "wellcome ", exceptionState);
   EXPECT_FALSE(exceptionState.hadException());
@@ skipping 5025 matching lines @@
   FrameTestHelpers::loadFrame(localFrame, "data:text/html,some page");
 
   // Local frame with remote parent should have transparent baseBackgroundColor.
   Color color = localFrame->frameView()->baseBackgroundColor();
   EXPECT_EQ(Color::transparent, color);
 
   view->close();
 }
 
 }  // namespace blink