Get the path of the plugin interposing library from the embedder, since...

Get the path of the plugin interposing library from the embedder, since they're the ones who bundle it. Make content still work without it. This allows plugins to work inside content_shell.

BUG=90448
Review URL: https://chromiumcodereview.appspot.com/10806075

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147965 0039d316-1c4b-4281-b951-d872f2087c98

chrome/common/chrome_content_client.cc

@@ -75,6 +75,9 @@ const char kGTalkPluginMimeType[] ="application/googletalk";
 const char kGTalkPluginExtension[] = ".googletalk";
 const char kGTalkPluginDescription[] = "Google Talk Plugin";
 
+const char kInterposeLibraryPath[] =
+    "@executable_path/../../../libplugin_carbon_interpose.dylib";
+
 #if defined(ENABLE_REMOTING)
 #if defined(GOOGLE_CHROME_BUILD)
 const char kRemotingViewerPluginName[] = "Chrome Remote Desktop Viewer";
@@ -532,6 +535,10 @@ bool ChromeContentClient::GetSandboxProfileForSandboxType(
   }
   return false;
 }
+
+std::string ChromeContentClient::GetCarbonInterposePath() const {
+  return std::string(kInterposeLibraryPath);
+}
 #endif
 
 bool ChromeContentClient::GetBundledFieldTrialPepperFlash(

chrome/common/chrome_content_client.h

@@ -46,6 +46,7 @@ class ChromeContentClient : public content::ContentClient {
   virtual bool GetSandboxProfileForSandboxType(
       int sandbox_type,
       int* sandbox_profile_resource_id) const OVERRIDE;
+  virtual std::string GetCarbonInterposePath() const OVERRIDE;
 #endif
 
   // Gets information about the bundled Pepper Flash for field trial.

content/browser/plugin_process_host.cc

@@ -261,14 +261,17 @@ bool PluginProcessHost::Init(const webkit::WebPluginInfo& info) {
 #if defined(OS_POSIX)
   base::EnvironmentVector env;
 #if defined(OS_MACOSX) && !defined(__LP64__)
-  // Add our interposing library for Carbon. This is stripped back out in
-  // plugin_main.cc, so changes here should be reflected there.
-  std::string interpose_list(plugin_interpose_strings::kInterposeLibraryPath);
-  const char* existing_list =
-      getenv(plugin_interpose_strings::kDYLDInsertLibrariesKey);
-  if (existing_list) {
-    interpose_list.insert(0, ":");
-    interpose_list.insert(0, existing_list);
+  std::string interpose_list =
+      content::GetContentClient()->GetCarbonInterposePath();
+  if (!interpose_list.empty()) {
+    // Add our interposing library for Carbon. This is stripped back out in
+    // plugin_main.cc, so changes here should be reflected there.
+    const char* existing_list =
+        getenv(plugin_interpose_strings::kDYLDInsertLibrariesKey);
+    if (existing_list) {
+      interpose_list.insert(0, ":");
+      interpose_list.insert(0, existing_list);
+    }
   }
   env.push_back(std::pair<std::string, std::string>(
       plugin_interpose_strings::kDYLDInsertLibrariesKey,

content/common/plugin_carbon_interpose_constants_mac.cc

@@ -9,8 +9,6 @@
 namespace plugin_interpose_strings {
 
 const char kDYLDInsertLibrariesKey[] = "DYLD_INSERT_LIBRARIES";
-const char kInterposeLibraryPath[] =
-    "@executable_path/../../../libplugin_carbon_interpose.dylib";
 
 }  // namespace plugin_interpose_strings
 

content/common/plugin_carbon_interpose_constants_mac.h

@@ -11,7 +11,6 @@
 namespace plugin_interpose_strings {
 
 extern const char kDYLDInsertLibrariesKey[];
-extern const char kInterposeLibraryPath[];
 
 }  // namespace plugin_interpose_strings
 

content/plugin/plugin_main_mac.mm

@@ -9,6 +9,7 @@
 #include "base/string_util.h"
 #include "content/common/plugin_carbon_interpose_constants_mac.h"
 #include "content/plugin/plugin_interpose_util_mac.h"
+#include "content/public/common/content_client.h"
 
 #if !defined(__LP64__)
 void TrimInterposeEnvironment() {
@@ -17,7 +18,7 @@ void TrimInterposeEnvironment() {
   std::string interpose_list;
   if (!env->GetVar(plugin_interpose_strings::kDYLDInsertLibrariesKey,
                    &interpose_list)) {
-    NOTREACHED() << "No interposing libraries set";
+    LOG(INFO) << "No Carbon Interpose library found.";
     return;
   }
 
@@ -26,8 +27,8 @@ void TrimInterposeEnvironment() {
   // need to handle are:
   // 1) The whole string is "<kInterposeLibraryPath>", so just clear it, or
   // 2) ":<kInterposeLibraryPath>" is the end of the string, so trim and re-set.
-  std::string interpose_library_path(
-      plugin_interpose_strings::kInterposeLibraryPath);
+  std::string interpose_library_path =
+      content::GetContentClient()->GetCarbonInterposePath();
   DCHECK_GE(interpose_list.size(), interpose_library_path.size());
   size_t suffix_offset = interpose_list.size() - interpose_library_path.size();
   if (suffix_offset == 0 &&

content/public/common/content_client.cc

@@ -85,6 +85,10 @@ bool ContentClient::GetSandboxProfileForSandboxType(
     int* sandbox_profile_resource_id) const {
   return false;
 }
+
+std::string ContentClient::GetCarbonInterposePath() const {
+  return std::string();
+}
 #endif
 
 }  // namespace content

content/public/common/content_client.h

@@ -139,6 +139,10 @@ class CONTENT_EXPORT ContentClient {
   virtual bool GetSandboxProfileForSandboxType(
       int sandbox_type,
       int* sandbox_profile_resource_id) const;
+
+  // Gets the Carbon interposing path to give to DYLD. Returns an empty string
+  // if the embedder doesn't bundle it.
+  virtual std::string GetCarbonInterposePath() const;
 #endif
 
   void set_browser_for_testing(ContentBrowserClient* c) { browser_ = c; }