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

chrome/browser/extensions/extension_creator.cc

 // 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.
 
 #include "chrome/browser/extensions/extension_creator.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_handle.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/extensions/extension_creator_filter.h"
-#include "chrome/common/extensions/extension_file_util.h"
 #include "crypto/rsa_private_key.h"
 #include "crypto/signature_creator.h"
 #include "extensions/common/crx_file.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/file_util.h"
 #include "extensions/common/id_util.h"
 #include "grit/generated_resources.h"
 #include "third_party/zlib/google/zip.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
   const int kRSAKeySize = 2048;
 };
 
 namespace extensions {
@@ skipping 70 matching lines @@
   std::string extension_id = id_util::GenerateId(public_key);
 
   // Load the extension once. We don't really need it, but this does a lot of
   // useful validation of the structure.
   int create_flags =
       Extension::FOLLOW_SYMLINKS_ANYWHERE | Extension::ERROR_ON_PRIVATE_KEY;
   if (run_flags & kRequireModernManifestVersion)
     create_flags |= Extension::REQUIRE_MODERN_MANIFEST_VERSION;
 
   scoped_refptr<Extension> extension(
-      extension_file_util::LoadExtension(
-          extension_dir,
-          extension_id,
-          Manifest::INTERNAL,
-          create_flags,
-          &error_message_));
+      file_util::LoadExtension(extension_dir,
+                               extension_id,
+                               Manifest::INTERNAL,
+                               create_flags,
+                               &error_message_));
   return !!extension.get();
 }
 
 crypto::RSAPrivateKey* ExtensionCreator::ReadInputKey(const base::FilePath&
     private_key_path) {
   if (!base::PathExists(private_key_path)) {
     error_message_ =
         l10n_util::GetStringUTF8(IDS_EXTENSION_PRIVATE_KEY_NO_EXISTS);
     return NULL;
   }
@@ skipping 195 matching lines @@
       SignZip(zip_path, key_pair.get(), &signature) &&
       WriteCRX(zip_path, key_pair.get(), signature, crx_path)) {
     result = true;
   }
 
   base::DeleteFile(zip_path, false);
   return result;
 }
 
 }  // namespace extensions