Valgrind: Fix leak in PluginList by actually calling Shutdown()....

webkit/glue/plugins/plugin_list.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_list.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
-#include "base/stl_util-inl.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/mime_util.h"
 #include "webkit/glue/plugins/plugin_constants_win.h"
 #include "webkit/glue/plugins/plugin_lib.h"
 #include "webkit/glue/plugins/plugin_switches.h"
 #include "webkit/glue/webkit_glue.h"
 
 #if defined(OS_POSIX)
+#include "base/stl_util-inl.h"
 #include "base/third_party/valgrind/valgrind.h"
 #endif  // defined(OS_POSIX)
 
 namespace NPAPI {
 
 #if defined(OS_MACOSX)
 // Plugin Groups for Mac.
 // Plugins are listed here as soon as vulnerabilities and solutions
 // (new versions) are published.
 // TODO(panayiotis): Get the Real Player version on Mac, somehow.
@@ skipping 671 matching lines @@
   }
 
   return did_change;
 }
 
 void PluginList::DisableOutdatedPluginGroups() {
   disable_outdated_plugins_ = true;
 }
 
 PluginList::~PluginList() {
+  Shutdown();
 }
 
 void PluginList::Shutdown() {
   // TODO
   // Note: plugin_groups_ contains simple pointers of type PluginGroup*, but
   // since this singleton lives until the process is destroyed, no explicit
   // cleanup is necessary.
   // However, when running on Valgrind, we need to do the cleanup to keep the
   // memory tree green.
 #if defined(OS_POSIX)
   if (RUNNING_ON_VALGRIND) {
     STLDeleteContainerPairSecondPointers(plugin_groups_.begin(),
                                          plugin_groups_.end());
   }
 #endif
 }
 
 }  // namespace NPAPI