reland 31875. Revert was:...

chrome/chrome.gyp

Index: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp	(revision 32085)
+++ chrome/chrome.gyp	(working copy)
@@ -2124,6 +2124,8 @@
         'browser/shell_integration_mac.mm',
         'browser/shell_integration_linux.cc',
         'browser/shell_integration_win.cc',
+        'browser/spellcheck_host.cc',
+        'browser/spellcheck_host.h',
         'browser/spellcheck_worditerator.cc',
         'browser/spellcheck_worditerator.h',
         'browser/spellchecker.cc',
@@ -2566,8 +2568,6 @@
           'sources': [
             'browser/crash_handler_host_linux.h',
             'browser/net/ssl_config_service_manager_pref.cc',
-            'browser/spellcheck_host.cc',
-            'browser/spellcheck_host.h',
           ],
           'sources/': [
             # Exclude most of printing.
@@ -3378,6 +3378,10 @@
         'renderer/renderer_web_database_observer.h',
         'renderer/socket_stream_dispatcher.cc',
         'renderer/socket_stream_dispatcher.h',
+        'renderer/spellchecker/spellcheck.cc',
+        'renderer/spellchecker/spellcheck.h',
+        'renderer/spellchecker/spellcheck_worditerator.cc',
+        'renderer/spellchecker/spellcheck_worditerator.h',
         'renderer/user_script_idle_scheduler.cc',
         'renderer/user_script_idle_scheduler.h',
         'renderer/user_script_slave.cc',
@@ -3414,12 +3418,6 @@
             '../build/linux/system.gyp:gtk',
             '../sandbox/sandbox.gyp:sandbox',
           ],
-          'sources': [
-            'renderer/spellchecker/spellcheck.cc',
-            'renderer/spellchecker/spellcheck.h',
-            'renderer/spellchecker/spellcheck_worditerator.cc',
-            'renderer/spellchecker/spellcheck_worditerator.h',
-          ],
         }],
         # Windows-specific rules.
         ['OS=="win"', {
@@ -3433,6 +3431,15 @@
             '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
           ],
         },],
+        # Mac-specific rules.
+        ['OS=="mac"', {
+          'sources!': [
+            'renderer/spellchecker/spellcheck.cc',
+            'renderer/spellchecker/spellcheck.h',
+            'renderer/spellchecker/spellcheck_worditerator.cc',
+            'renderer/spellchecker/spellcheck_worditerator.h',
+          ],
+        },],
       ],
     },
     {