linux: don't always print dlopen errors from LoadNativeLibrary

webkit/plugins/npapi/plugin_lib.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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/plugins/npapi/plugin_lib.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/stats_counters.h"
 #include "base/string_util.h"
 #include "webkit/glue/webkit_glue.h"
@@ skipping 161 matching lines @@
   if ((instance_count_ == 0) && webkit_glue::IsPluginRunningInRendererProcess())
     Unload();
 }
 
 bool PluginLib::Load() {
   if (library_)
     return true;
 
   bool rv = false;
   base::NativeLibrary library = 0;
+  std::string error;
 
   if (!internal_) {
 #if defined(OS_WIN)
     // This is to work around a bug in the Real player recorder plugin which
     // intercepts LoadLibrary calls from chrome.dll and wraps NPAPI functions
     // provided by the plugin. It crashes if the media player plugin is being
     // loaded. Workaround is to load the dll dynamically by getting the
     // LoadLibrary API address from kernel32.dll which bypasses the recorder
     // plugin.
     if (web_plugin_info_.name.find(L"Windows Media Player") !=
         std::wstring::npos) {
       library = base::LoadNativeLibraryDynamically(web_plugin_info_.path);
     } else {
-      library = base::LoadNativeLibrary(web_plugin_info_.path);
+      library = base::LoadNativeLibrary(web_plugin_info_.path, &error);
     }
-#else  // OS_WIN
-    library = base::LoadNativeLibrary(web_plugin_info_.path);
-#endif  // OS_WIN
-    if (library == 0) {
+#else
+    library = base::LoadNativeLibrary(web_plugin_info_.path, &error);
+#endif
+
+    if (!library) {
       LOG_IF(ERROR, PluginList::DebugPluginLoading())
-          << "Couldn't load plugin " << web_plugin_info_.path.value();
+          << "Couldn't load plugin " << web_plugin_info_.path.value() << " "
+          << error;
       return rv;
     }
 
 #if defined(OS_MACOSX)
     // According to the WebKit source, QuickTime at least requires us to call
     // UseResFile on the plugin resources before loading.
     if (library->bundle_resource_ref != -1)
       UseResFile(library->bundle_resource_ref);
 #endif
 
@@ skipping 144 matching lines @@
 
 void PluginLib::Shutdown() {
   if (initialized_ && !internal_) {
     NP_Shutdown();
     initialized_ = false;
   }
 }
 
 }  // namespace npapi
 }  // namespace webkit