Fix leak in ComponentLoader.

chrome/browser/extensions/component_loader.cc

 // 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 "chrome/browser/extensions/component_loader.h"
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/json/json_value_serializer.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 24 matching lines @@
       local_state_(local_state),
       extension_service_(extension_service) {
   pref_change_registrar_.Init(prefs);
 
   // This pref is set by policy. We have to watch it for change because on
   // ChromeOS, policy isn't loaded until after the browser process is started.
   pref_change_registrar_.Add(prefs::kEnterpriseWebStoreURL, this);
 }
 
 ComponentLoader::~ComponentLoader() {
+  ClearAllRegistered();
 }
 
 void ComponentLoader::LoadAll() {
   for (RegisteredComponentExtensions::iterator it =
            component_extensions_.begin();
        it != component_extensions_.end(); ++it) {
     Load(*it);
   }
 }
 
 DictionaryValue* ComponentLoader::ParseManifest(
     const std::string& manifest_contents) const {
   JSONStringValueSerializer serializer(manifest_contents);
   scoped_ptr<Value> manifest(serializer.Deserialize(NULL, NULL));
 
   if (!manifest.get() || !manifest->IsType(Value::TYPE_DICTIONARY)) {
     LOG(ERROR) << "Failed to parse extension manifest.";
     return NULL;
   }
   // Transfer ownership to the caller.
   return static_cast<DictionaryValue*>(manifest.release());
 }
 
+void ComponentLoader::ClearAllRegistered() {
+  for (RegisteredComponentExtensions::iterator it =
+           component_extensions_.begin();
+       it != component_extensions_.end(); ++it) {
+      delete it->manifest;
+  }
+
+  component_extensions_.clear();
+}
+
 const Extension* ComponentLoader::Add(
     int manifest_resource_id,
     const FilePath& root_directory) {
   std::string manifest_contents =
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           manifest_resource_id).as_string();
   return Add(manifest_contents, root_directory);
 }
 
 const Extension* ComponentLoader::Add(
@@ skipping 50 matching lines @@
   // Find the ComponentExtensionInfo for the extension.
   RegisteredComponentExtensions::iterator it = component_extensions_.begin();
   for (; it != component_extensions_.end(); ++it) {
     if (it->root_directory == root_directory)
       break;
   }
   // If the extension is not in the list, there's nothing to do.
   if (it == component_extensions_.end())
     return;
 
-  const DictionaryValue* manifest = it->manifest;
+  // The list owns the dictionary, so it must be deleted after removal.
+  scoped_ptr<const DictionaryValue> manifest(it->manifest);
 
   // Remove the extension from the list of registered extensions.
   *it = component_extensions_.back();
   component_extensions_.pop_back();
 
   // Determine the extension id and unload the extension.
   std::string public_key;
   std::string public_key_bytes;
   std::string id;
   if (!manifest->GetString(
@@ skipping 124 matching lines @@
 void ComponentLoader::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterStringPref(prefs::kEnterpriseWebStoreURL,
                             std::string() /* default_value */,
                             PrefService::UNSYNCABLE_PREF);
   prefs->RegisterStringPref(prefs::kEnterpriseWebStoreName,
                             std::string() /* default_value */,
                             PrefService::UNSYNCABLE_PREF);
 }
 
 }  // namespace extensions