Move the following files to content\public\plugin.

chrome/chrome.gyp

 # 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.
 {
   'variables': {
     'chromium_code': 1,
 
     'variables': {
       'version_py_path': 'tools/build/version.py',
       'version_path': 'VERSION',
@@ skipping 1059 matching lines @@
               ],
               'outputs': [
                 '<(PRODUCT_DIR)/<(branding).dmg',
               ],
               'action_name': 'build_app_dmg',
               'action': ['<(build_app_dmg_script_path)', '<@(branding)'],
             },
           ],  # 'actions'
         },
         {
           # Dummy target to allow chrome to require plugin_carbon_interpose to

[jam, 2011/10/11 02:08:39]

would all embedders want this magic? i.e. should this block be in content?

[Avi (use Gerrit), 2011/10/11 15:58:22]

All embedders require the carbon interpose library to achieve correct plugin
functionality.

           # build without actually linking to the resulting library.
           'target_name': 'interpose_dependency_shim',
           'type': 'executable',
           'dependencies': [
-            'plugin_carbon_interpose',
+             '../content/content.gyp:content_plugin:plugin_carbon_interpose',              
           ],
           # In release, we end up with a strip step that is unhappy if there is
           # no binary. Rather than check in a new file for this temporary hack,
           # just generate a source file on the fly.
           'actions': [
             {
               'action_name': 'generate_stub_main',
               'process_outputs_as_sources': 1,
               'inputs': [],
               'outputs': [ '<(INTERMEDIATE_DIR)/dummy_main.c' ],
               'action': [
                 'bash', '-c',
                 'echo "int main() { return 0; }" > <(INTERMEDIATE_DIR)/dummy_main.c'
               ],
             },
           ],
         },
         {
-          # dylib for interposing Carbon calls in the plugin process.
-          'target_name': 'plugin_carbon_interpose',
-          'type': 'shared_library',
-          'dependencies': [
-            'chrome_dll',
-          ],
-          'sources': [
-            'browser/plugin_carbon_interpose_mac.cc',
-          ],
-          'include_dirs': [
-            '..',
-          ],
-          'link_settings': {
-            'libraries': [
-              '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
-            ],
-          },
-          'xcode_settings': {
-            'DYLIB_COMPATIBILITY_VERSION': '<(version_mac_dylib)',
-            'DYLIB_CURRENT_VERSION': '<(version_mac_dylib)',
-            'DYLIB_INSTALL_NAME_BASE': '@executable_path/../../..',
-          },
-          'postbuilds': [
-            {
-              # The framework (chrome_dll) defines its load-time path
-              # (DYLIB_INSTALL_NAME_BASE) relative to the main executable
-              # (chrome).  A different relative path needs to be used in
-              # plugin_carbon_interpose, which runs in the helper_app.
-              'postbuild_name': 'Fix Framework Link',
-              'action': [
-                'install_name_tool',
-                '-change',
-                '@executable_path/../Versions/<(version_full)/<(mac_product_name) Framework.framework/<(mac_product_name) Framework',
-                '@executable_path/../../../<(mac_product_name) Framework.framework/<(mac_product_name) Framework',
-                '${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}'
-              ],
-            },
-          ],
-        },
-        {
           'target_name': 'infoplist_strings_tool',
           'type': 'executable',
           'dependencies': [
             'chrome_strings',
             '../base/base.gyp:base',
             '../ui/ui.gyp:ui',
           ],
           'include_dirs': [
             '<(grit_out_dir)',
           ],
@@ skipping 565 matching lines @@
                 'destination': '<(PRODUCT_DIR)/default_apps',
                 'files': ['<@(default_apps_list)']
               },
             ],
           }],
         ],
       }],  # targets
     }],  # OS != "mac"
   ],  # 'conditions'
 }