Merge 33052 - Linux: Do not unload the o3d plugin in the browser process. Thi...

webkit/glue/plugins/plugin_lib_linux.cc

 // Copyright (c) 2009 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.
 
 #include "webkit/glue/plugins/plugin_lib.h"
 
 #include <dlfcn.h>
 #include <elf.h>
 
 #include "base/string_util.h"
@@ skipping 41 matching lines @@
   if (elf_class == ELFCLASS32)
     return true;
 #elif defined(ARCH_CPU_64_BITS)
   if (elf_class == ELFCLASS64)
     return true;
 #endif
 
   return false;
 }
 
+// TODO(thestig) This is a hack to work around the crash in bug 25245. Remove
+// this once we read plugins out of process.
+bool SkipPluginUnloadHack(const WebPluginInfo& info) {
+  std::string filename = info.path.BaseName().value();
+  return (filename.find("npo3dautoplugin") != std::string::npos);  // O3D
+}
 
 }  // anonymous namespace
 namespace NPAPI {
 
 bool PluginLib::ReadWebPluginInfo(const FilePath& filename,
                                   WebPluginInfo* info) {
   // The file to reference is:
   // http://mxr.mozilla.org/firefox/source/modules/plugin/base/src/nsPluginsDirUnix.cpp
 
   // Skip files that aren't appropriate for our architecture.
@@ skipping 29 matching lines @@
     NP_GetValue(NULL, nsPluginVariable_NameString, &name);
     if (name)
       info->name = UTF8ToWide(name);
 
     const char* description = NULL;
     NP_GetValue(NULL, nsPluginVariable_DescriptionString, &description);
     if (description)
       info->desc = UTF8ToWide(description);
   }
 
-  base::UnloadNativeLibrary(dl);
+  if (!SkipPluginUnloadHack(*info))
+    base::UnloadNativeLibrary(dl);
 
   return true;
 }
 
 // static
 void PluginLib::ParseMIMEDescription(
     const std::string& description,
     std::vector<WebPluginMimeType>* mime_types) {
   // We parse the description here into WebPluginMimeType structures.
   // Naively from the NPAPI docs you'd think you could use
@@ skipping 29 matching lines @@
       mime_type.description = UTF8ToWide(description.substr(ofs));
     }
     mime_types->push_back(mime_type);
     if (end == std::string::npos)
       break;
     ofs = end + 1;
   }
 }
 
 }  // namespace NPAPI