Move WebTextCheckClient reference from WebViewImpl to WebLocalFrameImpl

components/spellcheck/renderer/spellcheck_provider.cc

 // Copyright (c) 2012 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 "components/spellcheck/renderer/spellcheck_provider.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "components/spellcheck/common/spellcheck_messages.h"
 #include "components/spellcheck/common/spellcheck_result.h"
 #include "components/spellcheck/renderer/spellcheck.h"
 #include "components/spellcheck/renderer/spellcheck_language.h"
 #include "components/spellcheck/spellcheck_build_features.h"
+#include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_view.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebElement.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebTextCheckingCompletion.h"
 #include "third_party/WebKit/public/web/WebTextCheckingResult.h"
 #include "third_party/WebKit/public/web/WebTextDecorationType.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
@@ skipping 11 matching lines @@
               int(SpellCheckResult::GRAMMAR), "mismatching enums");
 
 SpellCheckProvider::SpellCheckProvider(
     content::RenderView* render_view,
     SpellCheck* spellcheck)
     : content::RenderViewObserver(render_view),
       content::RenderViewObserverTracker<SpellCheckProvider>(render_view),
       spellcheck_(spellcheck) {
   DCHECK(spellcheck_);
   if (render_view) {  // NULL in unit tests.
-    render_view->GetWebView()->setTextCheckClient(this);
+    // For a main frame of a view, RenderFrameCreated is called earlier than
+    // RenderViewCreated. This workaround ensures that WebTextCheckClient is
+    // still set for any main frame.
+    // TODO(xiaocheng): Remove this workaround once SpellCheckProvider becomes
+    // a RenderFrameObserver.
+    if (content::RenderFrame* main_frame = render_view->GetMainRenderFrame())
+      main_frame->GetWebFrame()->setTextCheckClient(this);
     EnableSpellcheck(spellcheck_->IsSpellcheckEnabled());
   }
 }
 
 SpellCheckProvider::~SpellCheckProvider() {
 }
 
 void SpellCheckProvider::RequestTextChecking(
     const base::string16& text,
     WebTextCheckingCompletion* completion) {
@@ skipping 222 matching lines @@
     completion->didFinishCheckingText(results);
     return true;
   }
 
   return false;
 }
 
 void SpellCheckProvider::OnDestruct() {
   delete this;
 }