Move the following files to content\public\plugin.

content/content_plugin.gypi

Index: content/content_plugin.gypi
===================================================================
--- content/content_plugin.gypi	(revision 104808)
+++ content/content_plugin.gypi	(working copy)
@@ -14,11 +14,10 @@
   'sources': [
     # All .cc, .h, .m, and .mm files under plugins except for tests and
     # mocks.
-    'plugin/content_plugin_client.h',
     'plugin/plugin_channel.cc',
     'plugin/plugin_channel.h',
+    'plugin/plugin_interpose_util_mac.h',
     'plugin/plugin_interpose_util_mac.mm',
-    'plugin/plugin_interpose_util_mac.h',
     'plugin/plugin_main.cc',
     'plugin/plugin_main_linux.cc',
     'plugin/plugin_main_mac.mm',
@@ -30,6 +29,7 @@
     'plugin/webplugin_delegate_stub.h',
     'plugin/webplugin_proxy.cc',
     'plugin/webplugin_proxy.h',
+    'public/plugin/content_plugin_client.h',
   ],
   # These are layered in conditionals in the event other platforms
   # end up using this module as well.
@@ -49,5 +49,49 @@
         ],
       },
     }],
+    ['OS=="mac"', {
+      'targets': [
+        {
+          # dylib for interposing Carbon calls in the plugin process.
+          'target_name': 'plugin_carbon_interpose',
+          'type': 'shared_library',
+          'dependencies': [
+            'chrome_dll',

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

it's a layering violation that a module in content depends on one in chrome. why
is this needed?

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

As I mentioned, you should bring the carbon interpose target to content/, and
remove the dependency on chrome_dll. It only has a dependency on content anyway.

[Mark Mentovai, 2011/10/11 18:26:02]

Avi wrote:
While it may be true that it only depends on code that lives in content, this
target has a dependency on chrome_dll because it needs to link against the
framework. It must link against the framework (chrome_dll), not against static
libraries like content.

+          ],
+          'sources': [
+            'plugin/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',

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

nit: i don't know what this code is, but will this work with any embedder or is
this chrome specific?

[Mark Mentovai, 2011/10/11 18:26:02]

John Abd-El-Malek wrote:
This is Chrome-specific. It’s just about impossible to do this in a way generic
enough for embedders to handle. This is very dependent on the packaging
structure.

+                '@executable_path/../../../<(mac_product_name) Framework.framework/<(mac_product_name) Framework',
+                '${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}'
+              ],
+            },
+          ],
+        },        
+      ]
+    }]
   ],
 }