reland 31875. Revert was:...

build/common.gypi

 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   'variables': {
     # .gyp files should set chromium_code to 1 if they build Chromium-specific
@@ skipping 27 matching lines @@
       # Compute the architecture that we're building for. Default to the
       # architecture that we're building on.
       'conditions': [
         [ 'OS=="linux"', {
           # This handles the Linux platforms we generally deal with. Anything
           # else gets passed through, which probably won't work very well; such
           # hosts should pass an explicit target_arch to gyp.
           'target_arch%':
             '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/arm.*/arm/")',
 
-          # For now, only Linux spellchecks in the renderer.
-          'spellchecker_in_renderer%': 1,
         }, {  # OS!="linux"
           'target_arch%': 'ia32',
-
+        }],
+        [ 'OS=="mac"', {
+          # For now, only Linux and Windows use spellcheck in the renderer.
           'spellchecker_in_renderer%': 0,
+        }, {  # OS!="mac"
+          'spellchecker_in_renderer%': 1,
         }],
       ],
 
       # We do want to build Chromium with Breakpad support in certain
       # situations. I.e. for Chrome bot.
       'linux_chromium_breakpad%': 0,
       # And if we want to dump symbols.
       'linux_chromium_dump_symbols%': 0,
       # Also see linux_strip_binary below.
 
@@ skipping 72 matching lines @@
     'library%': 'static_library',
 
     # The Google Update appid.
     'google_update_appid%': '{8A69D345-D564-463c-AFF1-A69D9E530F96}',
 
     # Whether to add the experimental build define.
     'chrome_frame_define%': 0,
 
     # Whether pepper APIs are enabled.
     'enable_pepper%': 0,
-    
+
     # Whether usage of OpenMAX is enabled.
     'enable_openmax%': 0,
 
     # TODO(bradnelson): eliminate this when possible.
     # To allow local gyp files to prevent release.vsprops from being included.
     # Yes(1) means include release.vsprops.
     # Once all vsprops settings are migrated into gyp, this can go away.
     'msvs_use_common_release%': 1,
 
     # TODO(bradnelson): eliminate this when possible.
@@ skipping 810 matching lines @@
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: