[spellcheck] turn on async spellchecking for OSX.

Enabling this path gets us one step closer to server-side spell
checking. 

R=rlp@chromium.org
BUG=178241


Review URL: https://chromiumcodereview.appspot.com/12742017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191983 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 8 insertions, 14 deletions

diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 3da7582..07c1686 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1822,16 +1822,8 @@ void ChromeContentBrowserClient::OverrideWebkitPrefs(
     web_prefs->user_style_sheet_enabled = false;
   }
 
-  web_prefs->asynchronous_spell_checking_enabled =
-#if defined(OS_MACOSX)
-      // TODO(groby): Bug 107371: Implement asynchronous spellchecking API for
-      // Mac so it uses NSSpellChecker in the background.
-      false;
-#else
-      true;
-#endif
-  web_prefs->unified_textchecker_enabled =
-      web_prefs->asynchronous_spell_checking_enabled;
+  web_prefs->asynchronous_spell_checking_enabled = true;
+  web_prefs->unified_textchecker_enabled = true;
 
   web_prefs->uses_universal_detector =
       prefs->GetBoolean(prefs::kWebKitUsesUniversalDetector);
diff --git a/chrome/renderer/spellchecker/spellcheck.cc b/chrome/renderer/spellchecker/spellcheck.cc
index 0fadda7..d17d9e0 100644
--- a/chrome/renderer/spellchecker/spellcheck.cc
+++ b/chrome/renderer/spellchecker/spellcheck.cc
@@ -205,6 +205,9 @@ bool SpellCheck::SpellCheckParagraph(
   results->assign(textcheck_results);
   return false;
 #else
+  // This function is only invoked for spell checker functionality that runs
+  // on the render thread. OSX builds don't have that.
+  NOTREACHED();
   return true;
 #endif
 }
diff --git a/chrome/renderer/spellchecker/spellcheck_provider.cc b/chrome/renderer/spellchecker/spellcheck_provider.cc
index de4adf2..a1820d8 100644
--- a/chrome/renderer/spellchecker/spellcheck_provider.cc
+++ b/chrome/renderer/spellchecker/spellcheck_provider.cc
@@ -159,17 +159,16 @@ void SpellCheckProvider::checkTextOfParagraph(
     const WebKit::WebString& text,
     WebKit::WebTextCheckingTypeMask mask,
     WebKit::WebVector<WebKit::WebTextCheckingResult>* results) {
-#if !defined(OS_MACOSX)
-  // Since Mac has its own spell checker, this method will not be used on Mac.
-
   if (!results)
     return;
 
   if (!(mask & WebKit::WebTextCheckingTypeSpelling))
     return;
 
+  // TODO(groby): As far as I can tell, this method is never invoked.
+  // UMA results seem to support that. Investigate, clean up if true.
+  NOTREACHED();
   spellcheck_->SpellCheckParagraph(string16(text), results);
-#endif
   UMA_HISTOGRAM_COUNTS("SpellCheck.api.paragraph", text.length());
 }