Fix DictionaryValue leak in component_loader.cc

chrome/browser/extensions/component_loader.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_COMPONENT_LOADER_H_
 #define CHROME_BROWSER_EXTENSIONS_COMPONENT_LOADER_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 48 matching lines @@
                   const base::FilePath& root_directory);
 
   // Convenience method for registering a component extension by resource id.
   std::string Add(int manifest_resource_id,
                   const base::FilePath& root_directory);
 
   // Loads a component extension from file system. Replaces previously added
   // extension with the same ID.
   std::string AddOrReplace(const base::FilePath& path);
 
-  // Returns the extension ID of a component extension specified by resource
-  // id of its manifest file.
-  std::string GetExtensionID(int manifest_resource_id,
-                             const base::FilePath& root_directory);
-
   // Returns true if an extension with the specified id has been added.
   bool Exists(const std::string& id) const;
 
   // Unloads a component extension and removes it from the list of component
   // extensions to be loaded.
   void Remove(const base::FilePath& root_directory);
   void Remove(const std::string& id);
 
   // Call this during test setup to load component extensions that have
   // background pages for testing, which could otherwise interfere with tests.
   static void EnableBackgroundExtensionsForTesting();
 
   // Adds the default component extensions. If |skip_session_components|
   // the loader will skip loading component extensions that weren't supposed to
   // be loaded unless we are in signed user session (ChromeOS). For all other
   // platforms this |skip_session_components| is expected to be unset.
   void AddDefaultComponentExtensions(bool skip_session_components);
 
   // Similar to above but adds the default component extensions for kiosk mode.
   void AddDefaultComponentExtensionsForKioskMode(bool skip_session_components);
 
-  // Clear the list of registered extensions.
-  void ClearAllRegistered();
-
   // Reloads a registered component extension.
   void Reload(const std::string& extension_id);
 
 #if defined(OS_CHROMEOS)
   // Add a component extension from a specific directory. Assumes that the
   // extension uses a different manifest file when this is a guest session
   // and that the manifest file lives in |root_directory|. Calls |done_cb|
   // on success, unless the component loader is shut down during loading.
   void AddComponentFromDir(
       const base::FilePath& root_directory,
       const char* extension_id,
       const base::Closure& done_cb);
 
   void AddChromeOsSpeechSynthesisExtension();
 #endif
 
   void set_ignore_whitelist_for_testing(bool value) {
     ignore_whitelist_for_testing_ = value;
   }
 
  private:
   FRIEND_TEST_ALL_PREFIXES(ComponentLoaderTest, ParseManifest);
 
   // Information about a registered component extension.
   struct ComponentExtensionInfo {
-    ComponentExtensionInfo(const base::DictionaryValue* manifest,
-                           const base::FilePath& root_directory);
+    ComponentExtensionInfo(
+        std::unique_ptr<base::DictionaryValue> manifest_param,
+        const base::FilePath& root_directory);
+    ~ComponentExtensionInfo();
+
+    ComponentExtensionInfo(ComponentExtensionInfo&& other);
+    ComponentExtensionInfo& operator=(ComponentExtensionInfo&& other);
 
     // The parsed contents of the extensions's manifest file.
-    const base::DictionaryValue* manifest;
+    std::unique_ptr<base::DictionaryValue> manifest;
 
     // Directory where the extension is stored.
     base::FilePath root_directory;
 
     // The component extension's ID.
     std::string extension_id;
+
+   private:
+    DISALLOW_COPY_AND_ASSIGN(ComponentExtensionInfo);
   };
 
   // Parses the given JSON manifest. Returns nullptr if it cannot be parsed or
   // if the result is not a DictionaryValue.
-  base::DictionaryValue* ParseManifest(
+  std::unique_ptr<base::DictionaryValue> ParseManifest(
       base::StringPiece manifest_contents) const;
 
   std::string Add(const base::StringPiece& manifest_contents,
                   const base::FilePath& root_directory,
                   bool skip_whitelist);
-  std::string Add(const base::DictionaryValue* parsed_manifest,
+  std::string Add(std::unique_ptr<base::DictionaryValue> parsed_manifest,
                   const base::FilePath& root_directory,
                   bool skip_whitelist);
 
   // Loads a registered component extension.
   void Load(const ComponentExtensionInfo& info);
 
   void AddDefaultComponentExtensionsWithBackgroundPages(
       bool skip_session_components);
   void AddDefaultComponentExtensionsWithBackgroundPagesForKioskMode();
   void AddFileManagerExtension();
@@ skipping 50 matching lines @@
   base::WeakPtrFactory<ComponentLoader> weak_factory_;
 
   friend class TtsApiTest;
 
   DISALLOW_COPY_AND_ASSIGN(ComponentLoader);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_COMPONENT_LOADER_H_