Patch 2: Added a preprocessor flag for platform spellcheck.

chrome/renderer/spellchecker/spellcheck_provider.cc

Index: chrome/renderer/spellchecker/spellcheck_provider.cc
diff --git a/chrome/renderer/spellchecker/spellcheck_provider.cc b/chrome/renderer/spellchecker/spellcheck_provider.cc
index 840f3fb9508b9ed4b60ce2eaca1bebff3049ad34..21ea8a2941c4a0152b333f622aeee7c66c75bc52 100644
--- a/chrome/renderer/spellchecker/spellcheck_provider.cc
+++ b/chrome/renderer/spellchecker/spellcheck_provider.cc
@@ -72,7 +72,7 @@ void SpellCheckProvider::RequestTextChecking(
   last_request_.clear();
   last_results_.assign(blink::WebVector<blink::WebTextCheckingResult>());
 
-#if defined(OS_MACOSX)
+#if defined(USE_PLATFORM_SPELLCHECKER)
   // Text check (unified request for grammar and spell check) is only
   // available for browser process, so we ask the system spellchecker
   // over IPC or return an empty result if the checker is not
@@ -88,29 +88,28 @@ void SpellCheckProvider::RequestTextChecking(
       text_check_completions_.Add(completion),
       base::string16(text),
       markers));
-#endif  // !OS_MACOSX
+#endif  // !USE_PLATFORM_SPELLCHECKER
 }
 
 bool SpellCheckProvider::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(SpellCheckProvider, message)
-#if !defined(OS_MACOSX)
+#if !defined(USE_PLATFORM_SPELLCHECKER)
     IPC_MESSAGE_HANDLER(SpellCheckMsg_RespondSpellingService,
                         OnRespondSpellingService)
-#endif
-#if defined(OS_MACOSX)
+#else
     IPC_MESSAGE_HANDLER(SpellCheckMsg_AdvanceToNextMisspelling,
                         OnAdvanceToNextMisspelling)
     IPC_MESSAGE_HANDLER(SpellCheckMsg_RespondTextCheck, OnRespondTextCheck)
     IPC_MESSAGE_HANDLER(SpellCheckMsg_ToggleSpellPanel, OnToggleSpellPanel)
-#endif
+#endif // USE_PLATFORM_SPELLCHECKER
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void SpellCheckProvider::FocusedNodeChanged(const blink::WebNode& unused) {
-#if defined(OS_MACOSX)
+#if defined(USE_PLATFORM_SPELLCHECKER)
   WebFrame* frame = render_view()->GetWebView()->focusedFrame();
   WebElement element = frame->document().isNull() ? WebElement() :
       frame->document().focusedElement();
@@ -120,7 +119,7 @@ void SpellCheckProvider::FocusedNodeChanged(const blink::WebNode& unused) {
       frame->isContinuousSpellCheckingEnabled();
 
   Send(new SpellCheckHostMsg_ToggleSpellCheck(routing_id(), enabled, checked));
-#endif  // OS_MACOSX
+#endif  // USE_PLATFORM_SPELLCHECKER
 }
 
 void SpellCheckProvider::spellCheck(
@@ -186,7 +185,7 @@ WebString SpellCheckProvider::autoCorrectWord(const WebString& word) {
 }
 
 void SpellCheckProvider::showSpellingUI(bool show) {
-#if defined(OS_MACOSX)
+#if defined(USE_PLATFORM_SPELLCHECKER)
   UMA_HISTOGRAM_BOOLEAN("SpellCheck.api.showUI", show);
   Send(new SpellCheckHostMsg_ShowSpellingPanel(routing_id(), show));
 #endif
@@ -198,13 +197,13 @@ bool SpellCheckProvider::isShowingSpellingUI() {
 
 void SpellCheckProvider::updateSpellingUIWithMisspelledWord(
     const WebString& word) {
-#if defined(OS_MACOSX)
+#if defined(USE_PLATFORM_SPELLCHECKER)
   Send(new SpellCheckHostMsg_UpdateSpellingPanelWithMisspelledWord(routing_id(),
                                                                    word));
 #endif
 }
 
-#if !defined(OS_MACOSX)
+#if !defined(USE_PLATFORM_SPELLCHECKER)
 void SpellCheckProvider::OnRespondSpellingService(
     int identifier,
     bool succeeded,
@@ -236,7 +235,7 @@ void SpellCheckProvider::OnRespondSpellingService(
   last_request_ = line;
   last_results_.swap(textcheck_results);
 }
-#endif
+#endif // !USE_PLATFORM_SPELLCHECKER
 
 bool SpellCheckProvider::HasWordCharacters(
     const base::string16& text,
@@ -253,7 +252,7 @@ bool SpellCheckProvider::HasWordCharacters(
   return false;
 }
 
-#if defined(OS_MACOSX)
+#if defined(USE_PLATFORM_SPELLCHECKER)
 void SpellCheckProvider::OnAdvanceToNextMisspelling() {
   if (!render_view()->GetWebView())
     return;
@@ -293,7 +292,7 @@ void SpellCheckProvider::OnToggleSpellPanel(bool is_currently_visible) {
   render_view()->GetWebView()->focusedFrame()->executeCommand(
       WebString::fromUTF8("ToggleSpellPanel"));
 }
-#endif
+#endif // USE_PLATFORM_SPELLCHECKER
 
 void SpellCheckProvider::EnableSpellcheck(bool enable) {
   if (!render_view()->GetWebView())