reland 31875. Revert was:...

chrome/renderer/render_view.cc

 // Copyright (c) 2009 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.
 
 #if defined(ENABLE_PEPPER)
 #define PEPPER_APIS_ENABLED
 #endif
 
 #include "chrome/renderer/render_view.h"
 
@@ skipping 1487 matching lines @@
   return did_execute_command;
 }
 
 void RenderView::spellCheck(const WebString& text,
                             int& misspelled_offset,
                             int& misspelled_length) {
   EnsureDocumentTag();
 
 #if defined(SPELLCHECKER_IN_RENDERER)
   string16 word(text);
-  RenderThread::current()->spellchecker()->SpellCheckWord(
-      word.c_str(), word.size(), document_tag_,
-      &misspelled_offset, &misspelled_length, NULL);
+  RenderThread* thread = RenderThread::current();
+  // Will be NULL during unit tests.
+  if (thread) {
+    RenderThread::current()->spellchecker()->SpellCheckWord(
+        word.c_str(), word.size(), document_tag_,
+        &misspelled_offset, &misspelled_length, NULL);
+  }
 #else
   Send(new ViewHostMsg_SpellCheck(routing_id_, text, document_tag_,
                                   &misspelled_offset, &misspelled_length));
 #endif
 }
 
 WebString RenderView::autoCorrectWord(const WebKit::WebString& word) {
   string16 autocorrect_word;
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kExperimentalSpellcheckerFeatures)) {
     EnsureDocumentTag();
 #if defined(SPELLCHECKER_IN_RENDERER)
-    autocorrect_word =
-        RenderThread::current()->spellchecker()->GetAutoCorrectionWord(
-            word, document_tag_);
+    RenderThread* thread = RenderThread::current();
+    // Will be NULL during unit tests.
+    if (thread) {
+      autocorrect_word =
+          RenderThread::current()->spellchecker()->GetAutoCorrectionWord(
+              word, document_tag_);
+    }
 #else
     Send(new ViewHostMsg_GetAutoCorrectWord(
         routing_id_, word, document_tag_, &autocorrect_word));
 #endif
   }
   return autocorrect_word;
 }
 
 void RenderView::showSpellingUI(bool show) {
   Send(new ViewHostMsg_ShowSpellingPanel(routing_id_, show));
@@ skipping 2295 matching lines @@
       new PluginMsg_SignalModalDialogEvent(host_window_));
 
   message->EnableMessagePumping();  // Runs a nested message loop.
   bool rv = Send(message);
 
   PluginChannelHost::Broadcast(
       new PluginMsg_ResetModalDialogEvent(host_window_));
 
   return rv;
 }