Merge trunk r97497 and its many dependents to the 14.0.835 branch.

chrome/chrome_common.gypi

 # Copyright (c) 2011 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.
 
 {
   'target_defaults': {
     'variables': {
       'chrome_common_target': 0,
     },
     'target_conditions': [
@@ skipping 191 matching lines @@
         'common/important_file_writer.cc',
         'common/important_file_writer.h',
         'common/json_pref_store.cc',
         'common/json_pref_store.h',
         'common/json_schema_validator.cc',
         'common/json_schema_validator.h',
         'common/jstemplate_builder.cc',
         'common/jstemplate_builder.h',
         'common/launchd_mac.h',
         'common/launchd_mac.mm',
+        'common/mac/cfbundle_blocker.h',
+        'common/mac/cfbundle_blocker.mm',
         'common/libxml_utils.cc',
         'common/libxml_utils.h',
         'common/native_window_notification_source.h',
         'common/persistent_pref_store.h',
         'common/pref_store.cc',
         'common/pref_store.h',
         'common/print_messages.cc',
         'common/print_messages.h',
         'common/random.cc',
         'common/random.h',
@@ skipping 103 matching lines @@
               'message': 'Generating version information',
             },
           ],
         }],
         ['OS=="linux" and selinux==1', {
           'dependencies': [
             '../build/linux/system.gyp:selinux',
           ],
         }],
         ['OS=="mac"', {
+          'dependencies': [
+            '../third_party/mach_override/mach_override.gyp:mach_override',
+          ],
           'include_dirs': [
             '../third_party/GTM',
           ],
         }],
         ['remoting==1', {
           'dependencies': [
             '../remoting/remoting.gyp:remoting_client_plugin',
           ],
         }],
       ],
@@ skipping 227 matching lines @@
           'configurations': {
             'Common_Base': {
               'msvs_target_platform': 'x64',
             },
           },
         },
       ],
     }],
   ],
 }