Change SpellCheckProvider into a RenderFrameObserver

android_webview/renderer/aw_content_renderer_client.cc

 // Copyright 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 "android_webview/renderer/aw_content_renderer_client.h"
 
 #include <vector>
 
 #include "android_webview/common/aw_resource.h"
 #include "android_webview/common/aw_switches.h"
@@ skipping 152 matching lines @@
     // thread that a subframe was created.
     RenderThread::Get()->Send(new AwViewHostMsg_SubFrameCreated(
         parent_frame->GetRoutingID(), render_frame->GetRoutingID()));
   }
 
   // TODO(sgurun) do not create a password autofill agent (change
   // autofill agent to store a weakptr).
   autofill::PasswordAutofillAgent* password_autofill_agent =
       new autofill::PasswordAutofillAgent(render_frame);
   new autofill::AutofillAgent(render_frame, password_autofill_agent, NULL);
+
+#if BUILDFLAG(ENABLE_SPELLCHECK)
+  new SpellCheckProvider(render_frame, spellcheck_.get());
+#endif
 }
 
 void AwContentRendererClient::RenderViewCreated(
     content::RenderView* render_view) {
   AwRenderViewExt::RenderViewCreated(render_view);
 
 #if BUILDFLAG(ENABLE_SPELLCHECK)
-  new SpellCheckProvider(render_view, spellcheck_.get());
+  // This is a workaround keeping the behavior that, the Blink side spellcheck
+  // enabled state is initialized on RenderView creation.
+  // TODO(xiaochengh): Design better way to sync between Chrome-side and
+  // Blink-side spellcheck enabled states.  See crbug.com/710097.
+  if (SpellCheckProvider* provider =
+          SpellCheckProvider::Get(render_view->GetMainRenderFrame()))
+    provider->EnableSpellcheck(spellcheck_->IsSpellcheckEnabled());
 #endif
 }
 
 bool AwContentRendererClient::HasErrorPage(int http_status_code,
                                            std::string* error_domain) {
   return http_status_code >= 400;
 }
 
 void AwContentRendererClient::GetNavigationErrorStrings(
     content::RenderFrame* render_frame,
@@ skipping 105 matching lines @@
   for (auto* extension : kMediaPlayerExtensions) {
     if (base::EndsWith(url.path(), extension,
                        base::CompareCase::INSENSITIVE_ASCII)) {
       return true;
     }
   }
   return false;
 }
 
 }  // namespace android_webview