Patch 2: Added a preprocessor flag for platform spellcheck.

chrome/browser/spellchecker/spellcheck_message_filter.cc

Index: chrome/browser/spellchecker/spellcheck_message_filter.cc
diff --git a/chrome/browser/spellchecker/spellcheck_message_filter.cc b/chrome/browser/spellchecker/spellcheck_message_filter.cc
index d29c5141bdc7e1d304b7a6e8de7e56720dd6187a..81db996e6a486315176d5415abef1cd414355b41 100644
--- a/chrome/browser/spellchecker/spellcheck_message_filter.cc
+++ b/chrome/browser/spellchecker/spellcheck_message_filter.cc
@@ -37,7 +37,7 @@ void SpellCheckMessageFilter::OverrideThreadForMessage(
       message.type() == SpellCheckHostMsg_NotifyChecked::ID ||
       message.type() == SpellCheckHostMsg_RespondDocumentMarkers::ID)
     *thread = BrowserThread::UI;
-#if !defined(OS_MACOSX)
+#if !(USE_PLATFORM_SPELLCHECKER)

[please use gerrit instead, 2015/07/02 04:27:06]

You accidentally deleted "defined".

[dylanking, 2015/07/07 02:31:22]

Fixed in https://codereview.chromium.org/1227553002. Hope that's ok.

[dylanking, 2015/07/07 19:02:15]

Now fixed here, too.

   if (message.type() == SpellCheckHostMsg_CallSpellingService::ID)
     *thread = BrowserThread::UI;
 #endif
@@ -52,7 +52,7 @@ bool SpellCheckMessageFilter::OnMessageReceived(const IPC::Message& message) {
                         OnNotifyChecked)
     IPC_MESSAGE_HANDLER(SpellCheckHostMsg_RespondDocumentMarkers,
                         OnRespondDocumentMarkers)
-#if !defined(OS_MACOSX)
+#if !defined(USE_PLATFORM_SPELLCHECKER)
     IPC_MESSAGE_HANDLER(SpellCheckHostMsg_CallSpellingService,
                         OnCallSpellingService)
 #endif
@@ -106,7 +106,7 @@ void SpellCheckMessageFilter::OnRespondDocumentMarkers(
       render_process_id_, markers);
 }
 
-#if !defined(OS_MACOSX)
+#if !defined(USE_PLATFORM_SPELLCHECKER)
 void SpellCheckMessageFilter::OnCallSpellingService(
     int route_id,
     int identifier,
@@ -183,7 +183,7 @@ void SpellCheckMessageFilter::CallSpellingService(
                identifier,
                markers));
 }
-#endif
+#endif // !USE_PLATFORM_SPELLCHECKER
 
 SpellcheckService* SpellCheckMessageFilter::GetSpellcheckService() const {
   return SpellcheckServiceFactory::GetForRenderProcessId(render_process_id_);