Fix tweak_info_plist.py to be explicit about arguments.

content/content_shell.gypi

 # Copyright (c) 2012 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.
 
 {
   'variables': {
     'content_shell_product_name': 'Content Shell',
   },
   'targets': [
     {
@@ skipping 39 matching lines @@
         'shell/layout_test_controller_bindings.h',
         'shell/shell.cc',
         'shell/shell.h',
         'shell/shell_gtk.cc',
         'shell/shell_mac.mm',
         'shell/shell_win.cc',
         'shell/shell_browser_context.cc',
         'shell/shell_browser_context.h',
         'shell/shell_browser_main.cc',
         'shell/shell_browser_main.h',
+        'shell/shell_browser_main_mac.mm',
         'shell/shell_content_browser_client.cc',
         'shell/shell_content_browser_client.h',
         'shell/shell_content_client.cc',
         'shell/shell_content_client.h',
         'shell/shell_content_plugin_client.cc',
         'shell/shell_content_plugin_client.h',
         'shell/shell_content_renderer_client.cc',
         'shell/shell_content_renderer_client.h',
         'shell/shell_content_utility_client.cc',
         'shell/shell_content_utility_client.h',
@@ skipping 196 matching lines @@
             '<(DEPTH)/build/linux/system.gyp:gtk',
           ],
         }],  # toolkit_uses_gtk
         ['OS=="mac"', {
           'product_name': '<(content_shell_product_name)',
           'dependencies!': [
             'content_shell_lib',
           ],
           'dependencies': [
             'content_shell_framework',
+            'content_shell_helper_app',
+          ],
+          'copies': [
+            {
+              'destination': '<(PRODUCT_DIR)/<(content_shell_product_name).app/Contents/Frameworks',
+              'files': [
+                '<(PRODUCT_DIR)/<(content_shell_product_name) Helper.app',
+              ],
+            },
           ],
           'postbuilds': [
             {
               'postbuild_name': 'Copy <(content_shell_product_name) Framework.framework',
               'action': [
                 '../build/mac/copy_framework_unversioned.sh',
                 '${BUILT_PRODUCTS_DIR}/<(content_shell_product_name) Framework.framework',
                 '${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Frameworks',
               ],
             },
             {
               'postbuild_name': 'Fix Framework Link',
               'action': [
                 'install_name_tool',
                 '-change',
                 '/Library/Frameworks/<(content_shell_product_name) Framework.framework/Versions/A/<(content_shell_product_name) Framework',
                 '@executable_path/../Frameworks/<(content_shell_product_name) Framework.framework/<(content_shell_product_name) Framework',
                 '${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}'
               ],
             },
             {
               # Modify the Info.plist as needed.
               'postbuild_name': 'Tweak Info.plist',
               'action': ['../build/mac/tweak_info_plist.py',
                          '--svn=1'],
             },
             {
+              # This postbuid step is responsible for creating the following
+              # helpers:
+              #
+              # Content Shell Helper EH.app and Content Shell Helper NP.app are
+              # created from Content Shell Helper.app.
+              #
+              # The EH helper is marked for an executable heap. The NP helper
+              # is marked for no PIE (ASLR).
+              'postbuild_name': 'Make More Helpers',
+              'action': [
+                '../build/mac/make_more_helpers.sh',
+                '${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Frameworks',
+                '<(content_shell_product_name)',
+              ],
+            },
+            {
               # Make sure there isn't any Objective-C in the shell's
               # executable.
               'postbuild_name': 'Verify No Objective-C',
               'action': [
                 '../build/mac/verify_no_objc.sh',
               ],
             },
           ],
         }],  # OS=="mac"
       ],
@@ skipping 14 matching lines @@
           'dependencies': [
             'content_shell_lib',
           ],
           'include_dirs': [
             '..',
           ],
           'sources': [
             'shell/shell_content_main.cc',
             'shell/shell_content_main.h',
           ],
-        },
+        },  # target content_shell_framework
+        {
+          'target_name': 'content_shell_helper_app',
+          'type': 'executable',
+          'variables': { 'enable_wexit_time_destructors': 1, },
+          'product_name': '<(content_shell_product_name) Helper',
+          'mac_bundle': 1,
+          'dependencies': [
+            'content_shell_framework',
+          ],
+          'sources': [
+            'shell/shell_main.cc',
+            'shell/mac/helper-Info.plist',
+          ],
+          # TODO(mark): Come up with a fancier way to do this.  It should only
+          # be necessary to list helper-Info.plist once, not the three times it
+          # is listed here.
+          'mac_bundle_resources!': [
+            'shell/mac/helper-Info.plist',
+          ],
+          # TODO(mark): For now, don't put any resources into this app.  Its
+          # resources directory will be a symbolic link to the browser app's
+          # resources directory.
+          'mac_bundle_resources/': [
+            ['exclude', '.*'],
+          ],
+          'xcode_settings': {
+            'INFOPLIST_FILE': 'shell/mac/helper-Info.plist',
+          },
+          'postbuilds': [
+            {
+              # The framework defines its load-time path
+              # (DYLIB_INSTALL_NAME_BASE) relative to the main executable
+              # (chrome).  A different relative path needs to be used in
+              # content_shell_helper_app.
+              'postbuild_name': 'Fix Framework Link',
+              'action': [
+                'install_name_tool',
+                '-change',
+                '/Library/Frameworks/<(content_shell_product_name) Framework.framework/Versions/A/<(content_shell_product_name) Framework',
+                '@executable_path/../../../../Frameworks/<(content_shell_product_name) Framework.framework/<(content_shell_product_name) Framework',
+                '${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}'
+              ],
+            },
+            {
+              # Modify the Info.plist as needed.  The script explains why this
+              # is needed.  This is also done in the chrome and chrome_dll
+              # targets.  In this case, --breakpad=0, --keystone=0, and --svn=0
+              # are used because Breakpad, Keystone, and Subversion keys are
+              # never placed into the helper.
+              'postbuild_name': 'Tweak Info.plist',
+              'action': ['../build/mac/tweak_info_plist.py',
+                         '--breakpad=0',
+                         '--keystone=0',
+                         '--svn=0'],
+            },
+            {
+              # Make sure there isn't any Objective-C in the helper app's
+              # executable.
+              'postbuild_name': 'Verify No Objective-C',
+              'action': [
+                '../build/mac/verify_no_objc.sh',
+              ],
+            },
+          ],
+        },  # target content_shell_helper_app
       ],
     }],  # OS=="mac"
   ],
 }