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

chrome/utility/extensions/unpacker.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/utility/extensions/unpacker.h"
 
 #include <set>
 
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/i18n/rtl.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/memory/scoped_handle.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread.h"
 #include "base/values.h"
 #include "chrome/common/chrome_utility_messages.h"
 #include "chrome/common/extensions/api/i18n/default_locale_handler.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "content/public/child/image_decoder_utils.h"
 #include "content/public/common/common_param_traits.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_l10n_util.h"
+#include "extensions/common/file_util.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_constants.h"
 #include "grit/generated_resources.h"
 #include "ipc/ipc_message_utils.h"
 #include "net/base/file_stream.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/zlib/google/zip.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/size.h"
 
@@ skipping 157 matching lines @@
       *parsed_manifest_,
       creation_flags_,
       extension_id_,
       &error));
   if (!extension.get()) {
     SetError(error);
     return false;
   }
 
   std::vector<InstallWarning> warnings;
-  if (!extension_file_util::ValidateExtension(extension.get(),
-                                              &error, &warnings)) {
+  if (!file_util::ValidateExtension(extension.get(), &error, &warnings)) {
     SetError(error);
     return false;
   }
   extension->AddInstallWarnings(warnings);
 
   // Decode any images that the browser needs to display.
   std::set<base::FilePath> image_paths =
       extension_file_util::GetBrowserImagePaths(extension.get());
   for (std::set<base::FilePath>::iterator it = image_paths.begin();
        it != image_paths.end();
@@ skipping 103 matching lines @@
 
 void Unpacker::SetError(const std::string &error) {
   SetUTF16Error(base::UTF8ToUTF16(error));
 }
 
 void Unpacker::SetUTF16Error(const base::string16& error) {
   error_message_ = error;
 }
 
 }  // namespace extensions