Revert of Remove ExtensionService Garbage-Collecting methods.

chrome/common/extensions/extension_file_util.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_COMMON_EXTENSIONS_EXTENSION_FILE_UTIL_H_
 #define CHROME_COMMON_EXTENSIONS_EXTENSION_FILE_UTIL_H_
 
 #include <map>
 #include <string>
 
-#include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/common/extensions/message_bundle.h"
 #include "extensions/common/manifest.h"
 
 class ExtensionIconSet;
 
 namespace base {
 class DictionaryValue;
 class FilePath;
 }
 
 namespace extensions {
 class Extension;
 class MessageBundle;
 struct InstallWarning;
 }
 
 // Utilities for manipulating the on-disk storage of extensions.
 namespace extension_file_util {
 
-extern const base::FilePath::CharType kTempDirectoryName[];
-
 // Copies |unpacked_source_dir| into the right location under |extensions_dir|.
 // The destination directory is returned on success, or empty path is returned
 // on failure.
 base::FilePath InstallExtension(const base::FilePath& unpacked_source_dir,
                                 const std::string& id,
                                 const std::string& version,
                                 const base::FilePath& extensions_dir);
 
 // Removes all versions of the extension with |id| from |extensions_dir|.
 void UninstallExtension(const base::FilePath& extensions_dir,
@@ skipping 43 matching lines @@
 // Returns a list of paths (relative to the extension dir) for images that
 // the browser might load (like themes and page action icons) for the given
 // extension.
 std::set<base::FilePath> GetBrowserImagePaths(
     const extensions::Extension* extension);
 
 // Returns a list of files that contain private keys inside |extension_dir|.
 std::vector<base::FilePath> FindPrivateKeyFiles(
     const base::FilePath& extension_dir);
 
+// Cleans up the extension install directory. It can end up with garbage in it
+// if extensions can't initially be removed when they are uninstalled (eg if a
+// file is in use).
+//
+// |extensions_dir| is the install directory to look in. |extension_paths| is a
+// map from extension id to full installation path.
+//
+// Obsolete version directories are removed, as are directories that aren't
+// found in |extension_paths|.
+//
+// The "Temp" directory that is used during extension installation only gets
+// removed if |clean_temp_dir| is true.
+void GarbageCollectExtensions(
+    const base::FilePath& extensions_dir,
+    const std::multimap<std::string, base::FilePath>& extension_paths,
+    bool clean_temp_dir);
+
 // Loads extension message catalogs and returns message bundle.
 // Returns NULL on error, or if extension is not localized.
 extensions::MessageBundle* LoadMessageBundle(
     const base::FilePath& extension_path,
     const std::string& default_locale,
     std::string* error);
 
 // Loads the extension message bundle substitution map. Contains at least
 // extension_id item.
 extensions::MessageBundle::SubstitutionMap* LoadMessageBundleSubstitutionMap(
@@ skipping 16 matching lines @@
 base::FilePath GetInstallTempDir(const base::FilePath& extensions_dir);
 
 // Helper function to delete files. This is used to avoid ugly casts which
 // would be necessary with PostMessage since base::Delete is overloaded.
 // TODO(skerner): Make a version of Delete that is not overloaded in file_util.
 void DeleteFile(const base::FilePath& path, bool recursive);
 
 }  // namespace extension_file_util
 
 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_FILE_UTIL_H_