Move most of extension_file_util.cc into extensions/common/file_util.cc

chrome/browser/extensions/crx_installer.cc

Index: chrome/browser/extensions/crx_installer.cc
diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc
index 2ec84020f825ca2e486ffc5deaf55bf26e34e50a..2466c633f88054bada148bc47673c29b43529692 100644
--- a/chrome/browser/extensions/crx_installer.cc
+++ b/chrome/browser/extensions/crx_installer.cc
@@ -36,7 +36,6 @@
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension_constants.h"
-#include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/extensions/manifest_url_handler.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
@@ -45,6 +44,7 @@
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension_icon_set.h"
 #include "extensions/common/feature_switch.h"
+#include "extensions/common/file_util.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_handlers/kiosk_mode_info.h"
 #include "extensions/common/manifest_handlers/shared_module_info.h"
@@ -683,11 +683,11 @@ void CrxInstaller::CompleteInstall() {
     "Extensions.CrxInstallDirPathLength",
         install_directory_.value().length(), 0, 500, 100);
 
-  base::FilePath version_dir = extension_file_util::InstallExtension(
-      unpacked_extension_root_,
-      extension()->id(),
-      extension()->VersionString(),
-      install_directory_);
+  base::FilePath version_dir =
+      file_util::InstallExtension(unpacked_extension_root_,
+                                  extension()->id(),
+                                  extension()->VersionString(),
+                                  install_directory_);
   if (version_dir.empty()) {
     ReportFailureFromFileThread(
         CrxInstallerError(
@@ -705,11 +705,12 @@ void CrxInstaller::CompleteInstall() {
   // with base::string16
   std::string extension_id = extension()->id();
   std::string error;
-  installer_.set_extension(extension_file_util::LoadExtension(
-      version_dir,
-      install_source_,
-      extension()->creation_flags() | Extension::REQUIRE_KEY,
-      &error).get());
+  installer_.set_extension(
+      file_util::LoadExtension(
+          version_dir,
+          install_source_,
+          extension()->creation_flags() | Extension::REQUIRE_KEY,
+          &error).get());
 
   if (extension()) {
     ReportSuccessFromFileThread();
@@ -829,12 +830,12 @@ void CrxInstaller::CleanupTempFiles() {
 
   // Delete the temp directory and crx file as necessary.
   if (!temp_dir_.value().empty()) {
-    extension_file_util::DeleteFile(temp_dir_, true);
+    file_util::DeleteFile(temp_dir_, true);
     temp_dir_ = base::FilePath();
   }
 
   if (delete_source_ && !source_file_.value().empty()) {
-    extension_file_util::DeleteFile(source_file_, false);
+    file_util::DeleteFile(source_file_, false);
     source_file_ = base::FilePath();
   }
 }