Merge Chromium at r11.0.696.0: Initial merge by git

Change-Id: I273dde2843af0839dfc08b419bb443fbd449532d

1 files changed, 6 insertions, 0 deletions

diff --git a/chrome/common/extensions/extension_file_util.h b/chrome/common/extensions/extension_file_util.h
index b26b564..066ee80 100644
--- a/chrome/common/extensions/extension_file_util.h
+++ b/chrome/common/extensions/extension_file_util.h
@@ -40,6 +40,7 @@ void UninstallExtension(const FilePath& extensions_dir,
 scoped_refptr<Extension> LoadExtension(const FilePath& extension_root,
                                        Extension::Location location,
                                        bool require_key,
+                                       bool strict_error_checks,
                                        std::string* error);
 
 // Returns true if the given extension object is valid and consistent.
@@ -82,6 +83,11 @@ FilePath ExtensionURLToRelativeFilePath(const GURL& url);
 // Return an empty file path on failure.
 FilePath GetUserDataTempDir();
 
+// Helper function to delete files. This is used to avoid ugly casts which
+// would be necessary with PostMessage since file_util::Delete is overloaded.
+// TODO(skerner): Make a version of Delete that is not overloaded in file_util.
+void DeleteFile(const FilePath& path, bool recursive);
+
 }  // namespace extension_file_util
 
 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_FILE_UTIL_H_