Making the browser tests work on Unix

webkit/glue/plugins/plugin_lib_mac.mm

 // Copyright (c) 2006-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 "config.h"
 
 #import <Carbon/Carbon.h>
 
 #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"
 
 static const short kSTRTypeDefinitionResourceID = 128;
 static const short kSTRTypeDescriptionResourceID = 127;
 static const short kSTRPluginDescriptionResourceID = 126;
 
 namespace NPAPI
 {
@@ skipping 267 matching lines @@
   // (1) <<type0description>>
   // (2) <<type1description>>
   // (...)
   // (n+1) <<typendescription>>
   // STR# 126
   // (1) <<plugindescription>>
   // (2) <<pluginname>>
   //
   // 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;
 
   // preflight
 
   OSType type = 0;
   CFBundleGetPackageInfo(bundle.get(), &type, NULL);
   if (type != FOUR_CHAR_CODE('BRPL'))
     return false;
 
   CFErrorRef error;
   Boolean would_load = CFBundlePreflightExecutable(bundle.get(), &error);
   if (!would_load)
     return false;
 
   // get the info
 
   if (ReadPlistPluginInfo(filename, bundle.get(), info))
     return true;
 
   if (ReadSTRPluginInfo(filename, bundle.get(), info))
     return true;
 
   // ... or not
 
   return false;
 }
 
 }  // namespace NPAPI