Enhance plugin logging a bit. This adds logging in a few more places, especia...

webkit/glue/plugins/plugin_lib.cc

 // Copyright (c) 2010 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 "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stats_counters.h"
 #include "base/string_util.h"
@@ skipping 80 matching lines @@
   if (saved_data_ != 0) {
     // TODO - delete the savedData object here
   }
 }
 
 NPPluginFuncs* PluginLib::functions() {
   return &plugin_funcs_;
 }
 
 NPError PluginLib::NP_Initialize() {
-  LOG(INFO) << "PluginLib::NP_Initialize(" << web_plugin_info_.path.value() <<
-               "): initialized=" << initialized_;
+  LOG_IF(ERROR, PluginList::DebugPluginLoading())
+      << "PluginLib::NP_Initialize(" << web_plugin_info_.path.value()
+      << "): initialized=" << initialized_;
   if (initialized_)
     return NPERR_NO_ERROR;
 
   if (!Load())
     return NPERR_MODULE_LOAD_FAILED_ERROR;
 
   PluginHost* host = PluginHost::Singleton();
   if (host == 0)
     return NPERR_GENERIC_ERROR;
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
   NPError rv = entry_points_.np_initialize(host->host_functions(),
                                            &plugin_funcs_);
 #else
   NPError rv = entry_points_.np_initialize(host->host_functions());
 #if defined(OS_MACOSX)
   // On the Mac, we need to get entry points after calling np_initialize to
   // match the behavior of other browsers.
   if (rv == NPERR_NO_ERROR) {
     rv = entry_points_.np_getentrypoints(&plugin_funcs_);
   }
 #endif  // OS_MACOSX
 #endif
-  LOG(INFO) << "PluginLib::NP_Initialize(" << web_plugin_info_.path.value() <<
-               "): result=" << rv;
+  LOG_IF(ERROR, PluginList::DebugPluginLoading())
+      << "PluginLib::NP_Initialize(" << web_plugin_info_.path.value()
+      << "): result=" << rv;
   initialized_ = (rv == NPERR_NO_ERROR);
   return rv;
 }
 
 void PluginLib::NP_Shutdown(void) {
   DCHECK(initialized_);
   entry_points_.np_shutdown();
 }
 
 void PluginLib::PreventLibraryUnload() {
@@ skipping 20 matching lines @@
 bool PluginLib::Load() {
   if (library_)
     return true;
 
   bool rv = false;
   base::NativeLibrary library = 0;
 
   if (!internal_) {
     library = base::LoadNativeLibrary(web_plugin_info_.path);
     if (library == 0) {
-      LOG_IF(INFO, PluginList::DebugPluginLoading())
+      LOG_IF(ERROR, PluginList::DebugPluginLoading())
           << "Couldn't load plugin " << web_plugin_info_.path.value();
       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 29 matching lines @@
 #if !defined(OS_POSIX)
     if (entry_points_.np_getentrypoints(&plugin_funcs_) != NPERR_NO_ERROR)
       rv = false;
 #else
     // On Linux and Mac, we get the plugin entry points during NP_Initialize.
 #endif
   }
 
   if (!internal_) {
     if (rv) {
-      LOG_IF(INFO, PluginList::DebugPluginLoading())
+      LOG_IF(ERROR, PluginList::DebugPluginLoading())
           << "Plugin " << web_plugin_info_.path.value()
           << " loaded successfully.";
       library_ = library;
     } else {
-      LOG_IF(INFO, PluginList::DebugPluginLoading())
+      LOG_IF(ERROR, PluginList::DebugPluginLoading())
           << "Plugin " << web_plugin_info_.path.value()
           << " failed to load, unloading.";
       base::UnloadNativeLibrary(library);
     }
   }
 
   return rv;
 }
 
 // This class implements delayed NP_Shutdown and FreeLibrary on the plugin dll.
@@ skipping 36 matching lines @@
     // NP_Shutdown and FreeLibrary calls at least till the next
     // peek message.
     defer_unload = true;
 #endif
 */
 
     if (defer_unload) {
       FreePluginLibraryTask* free_library_task =
           new FreePluginLibraryTask(skip_unload_ ? NULL : library_,
                                     entry_points_.np_shutdown);
-      LOG_IF(INFO, PluginList::DebugPluginLoading())
+      LOG_IF(ERROR, PluginList::DebugPluginLoading())
           << "Scheduling delayed unload for plugin "
           << web_plugin_info_.path.value();
       MessageLoop::current()->PostTask(FROM_HERE, free_library_task);
     } else {
       Shutdown();
       if (!skip_unload_) {
-        LOG_IF(INFO, PluginList::DebugPluginLoading())
+        LOG_IF(ERROR, PluginList::DebugPluginLoading())
             << "Unloading plugin " << web_plugin_info_.path.value();
         base::UnloadNativeLibrary(library_);
       }
     }
 
     library_ = NULL;
   }
 
   for (size_t i = 0; i < g_loaded_libs->size(); ++i) {
     if ((*g_loaded_libs)[i].get() == this) {
       g_loaded_libs->erase(g_loaded_libs->begin() + i);
       break;
     }
   }
   if (g_loaded_libs->empty()) {
     delete g_loaded_libs;
     g_loaded_libs = NULL;
   }
 }
 
 void PluginLib::Shutdown() {
   if (initialized_ && !internal_) {
     NP_Shutdown();
     initialized_ = false;
   }
 }
 
 }  // namespace NPAPI