Making the browser tests work on Unix

webkit/glue/plugins/plugin_lib.cc

 // Copyright (c) 2006-2008 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"
 
 #include "webkit/glue/plugins/plugin_lib.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stats_counters.h"
 #include "base/string_util.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/plugins/plugin_instance.h"
 #include "webkit/glue/plugins/plugin_host.h"
 #include "webkit/glue/plugins/plugin_list.h"
 
-// A macro for converting string constants into appropriate
-// NativeLibraryFunctionNameTypes.
-#if defined(OS_MACOSX)
-#define NATIVE_LIBRARY_FUNCTION_NAME(x) CFSTR(x)
-#else
-#define NATIVE_LIBRARY_FUNCTION_NAME(x) x
-#endif  // OS_*
-
 namespace NPAPI
 {
 
 const char kPluginLibrariesLoadedCounter[] = "PluginLibrariesLoaded";
 const char kPluginInstancesActiveCounter[] = "PluginInstancesActive";
 
 // A list of all the instantiated plugins.
 static std::vector<scoped_refptr<PluginLib> >* g_loaded_libs;
 
 PluginLib* PluginLib::CreatePluginLib(const FilePath& filename) {
@@ skipping 133 matching lines @@
       return rv;
 
     library = base::LoadNativeLibrary(web_plugin_info_.path);
     if (library == 0)
       return rv;
 
     rv = true;  // assume success now
 
     entry_points_.np_initialize =
         (NP_InitializeFunc)base::GetFunctionPointerFromNativeLibrary(library,
-            NATIVE_LIBRARY_FUNCTION_NAME("NP_Initialize"));
+            "NP_Initialize");
     if (entry_points_.np_initialize == 0)
       rv = false;
 
 #if !defined(OS_LINUX)
     entry_points_.np_getentrypoints =
         (NP_GetEntryPointsFunc)base::GetFunctionPointerFromNativeLibrary(
-            library,
-            NATIVE_LIBRARY_FUNCTION_NAME("NP_GetEntryPoints"));
+            library, "NP_GetEntryPoints");
     if (entry_points_.np_getentrypoints == 0)
       rv = false;
 #endif
 
     entry_points_.np_shutdown =
         (NP_ShutdownFunc)base::GetFunctionPointerFromNativeLibrary(library,
-            NATIVE_LIBRARY_FUNCTION_NAME("NP_Shutdown"));
+            "NP_Shutdown");
     if (entry_points_.np_shutdown == 0)
       rv = false;
   } else {
     rv = true;
   }
 
   if (rv) {
     plugin_funcs_.size = sizeof(plugin_funcs_);
     plugin_funcs_.version = (NP_VERSION_MAJOR << 8) | NP_VERSION_MINOR;
 #if !defined(OS_LINUX)
@@ skipping 69 matching lines @@
 }
 
 void PluginLib::Shutdown() {
   if (initialized_ && !internal_) {
     NP_Shutdown();
     initialized_ = false;
   }
 }
 
 }  // namespace NPAPI