Patch 2: Added a preprocessor flag for platform spellcheck.

chrome/common/spellcheck_messages.h

Index: chrome/common/spellcheck_messages.h
diff --git a/chrome/common/spellcheck_messages.h b/chrome/common/spellcheck_messages.h
index b0e3cee71c34a07ef48c05a6037cad74584303a7..2f8da14ab6edb69c937b7c09bcefcb6cbe1819da 100644
--- a/chrome/common/spellcheck_messages.h
+++ b/chrome/common/spellcheck_messages.h
@@ -64,7 +64,7 @@ IPC_MESSAGE_CONTROL0(SpellCheckMsg_RequestDocumentMarkers)
 IPC_MESSAGE_CONTROL1(SpellCheckHostMsg_RespondDocumentMarkers,
                      std::vector<uint32> /* document marker identifiers */)
 
-#if !defined(OS_MACOSX)
+#if !defined(USE_PLATFORM_SPELLCHECKER)
 // Sends text-check results from the Spelling service when the service finishes
 // checking text received by a SpellCheckHostMsg_CallSpellingService message.
 // If the service is not available, the 4th parameter should be false and the
@@ -74,9 +74,7 @@ IPC_MESSAGE_ROUTED4(SpellCheckMsg_RespondSpellingService,
                     bool            /* succeeded calling service */,
                     base::string16  /* sentence */,
                     std::vector<SpellCheckResult>)
-#endif
-
-#if defined(OS_MACOSX)
+#else
 // This message tells the renderer to advance to the next misspelling. It is
 // sent when the user clicks the "Find Next" button on the spelling panel.
 IPC_MESSAGE_ROUTED0(SpellCheckMsg_AdvanceToNextMisspelling)
@@ -89,7 +87,7 @@ IPC_MESSAGE_ROUTED2(SpellCheckMsg_RespondTextCheck,
 
 IPC_MESSAGE_ROUTED1(SpellCheckMsg_ToggleSpellPanel,
                     bool)
-#endif
+#endif // USE_PLATFORM_SPELLCHECKER
 
 // Messages sent from the renderer to the browser.
 
@@ -103,7 +101,7 @@ IPC_MESSAGE_ROUTED2(SpellCheckHostMsg_NotifyChecked,
                     base::string16 /* word */,
                     bool /* true if checked word is misspelled */)
 
-#if !defined(OS_MACOSX)
+#if !defined(USE_PLATFORM_SPELLCHECKER)
 // Asks the Spelling service to check text. When the service finishes checking
 // the input text, it sends a SpellingCheckMsg_RespondSpellingService with
 // text-check results.
@@ -112,9 +110,7 @@ IPC_MESSAGE_CONTROL4(SpellCheckHostMsg_CallSpellingService,
                      int /* request identifier given by WebKit */,
                      base::string16 /* sentence */,
                      std::vector<SpellCheckMarker> /* markers */)
-#endif
-
-#if defined(OS_MACOSX)
+#else
 // Tells the browser to display or not display the SpellingPanel
 IPC_MESSAGE_ROUTED1(SpellCheckHostMsg_ShowSpellingPanel,
                     bool /* if true, then show it, otherwise hide it*/)
@@ -142,4 +138,4 @@ IPC_MESSAGE_CONTROL4(SpellCheckHostMsg_RequestTextCheck,
 IPC_MESSAGE_ROUTED2(SpellCheckHostMsg_ToggleSpellCheck,
                     bool /* enabled */,
                     bool /* checked */)
-#endif  // OS_MACOSX
+#endif  // USE_PLATFORM_SPELLCHECKER