Making the browser tests work on Unix

webkit/glue/plugins/plugin_lib_mac.mm

Index: webkit/glue/plugins/plugin_lib_mac.mm
===================================================================
--- webkit/glue/plugins/plugin_lib_mac.mm	(revision 17736)
+++ webkit/glue/plugins/plugin_lib_mac.mm	(working copy)
@@ -8,7 +8,9 @@
 
 #include "webkit/glue/plugins/plugin_lib.h"
 
+#include "base/native_library.h"
 #include "base/scoped_cftyperef.h"
+#include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "webkit/glue/plugins/plugin_list.h"
@@ -296,7 +298,14 @@
   //
   // Strictly speaking, only STR# 128 is required.
 
-  scoped_cftyperef<CFBundleRef> bundle(base::LoadNativeLibrary(filename));
+  // We are accessing the bundle contained in the NativeLibrary but not
+  // unloading it.  We use a scoped_ptr to make sure the NativeLibraryStruct is
+  // not leaked.
+  scoped_ptr<base::NativeLibraryStruct> native_library(
+      base::LoadNativeLibrary(filename));
+  if (native_library->type != base::BUNDLE)
+    return false;
+  scoped_cftyperef<CFBundleRef> bundle(native_library->bundle);
   if (!bundle)
     return false;