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

chrome/browser/extensions/unpacked_installer.cc

 // Copyright (c) 2013 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/unpacked_installer.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/permissions_updater.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/api/plugins/plugins_handler.h"
-#include "chrome/common/extensions/extension_file_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_l10n_util.h"
+#include "extensions/common/file_util.h"
 #include "extensions/common/id_util.h"
 #include "extensions/common/manifest.h"
 #include "sync/api/string_ordinal.h"
 
 using content::BrowserThread;
 using extensions::Extension;
 
 namespace {
 
 const char kUnpackedExtensionsBlacklistedError[] =
@@ skipping 105 matching lines @@
   base::ThreadRestrictions::ScopedAllowIO allow_io;
 
   extension_path_ = base::MakeAbsoluteFilePath(path_in);
 
   if (!IsLoadingUnpackedAllowed()) {
     ReportExtensionLoadError(kUnpackedExtensionsBlacklistedError);
     return false;
   }
 
   std::string error;
-  installer_.set_extension(extension_file_util::LoadExtension(
-      extension_path_, Manifest::COMMAND_LINE, GetFlags(), &error).get());
+  installer_.set_extension(
+      file_util::LoadExtension(
+          extension_path_, Manifest::COMMAND_LINE, GetFlags(), &error).get());
 
   if (!installer_.extension().get() ||
       !extension_l10n_util::ValidateExtensionLocales(
           extension_path_,
           installer_.extension()->manifest()->value(),
           &error)) {
     ReportExtensionLoadError(error);
     return false;
   }
 
@@ skipping 65 matching lines @@
   ExtensionPrefs* prefs = ExtensionPrefs::Get(service_weak_->profile());
   return !prefs->ExtensionsBlacklistedByDefault();
 }
 
 void UnpackedInstaller::GetAbsolutePath() {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   extension_path_ = base::MakeAbsoluteFilePath(extension_path_);
 
   std::string error;
-  if (!extension_file_util::CheckForIllegalFilenames(extension_path_,
-                                                     &error)) {
+  if (!file_util::CheckForIllegalFilenames(extension_path_, &error)) {
     BrowserThread::PostTask(
         BrowserThread::UI,
         FROM_HERE,
         base::Bind(&UnpackedInstaller::ReportExtensionLoadError, this, error));
     return;
   }
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&UnpackedInstaller::CheckExtensionFileAccess, this));
 }
@@ skipping 11 matching lines @@
   BrowserThread::PostTask(
       BrowserThread::FILE,
       FROM_HERE,
       base::Bind(&UnpackedInstaller::LoadWithFileAccess, this, GetFlags()));
 }
 
 void UnpackedInstaller::LoadWithFileAccess(int flags) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   std::string error;
-  installer_.set_extension(extension_file_util::LoadExtension(
-      extension_path_, Manifest::UNPACKED, flags, &error).get());
+  installer_.set_extension(
+      file_util::LoadExtension(
+          extension_path_, Manifest::UNPACKED, flags, &error).get());
 
   if (!installer_.extension().get() ||
       !extension_l10n_util::ValidateExtensionLocales(
           extension_path_,
           installer_.extension()->manifest()->value(),
           &error)) {
     BrowserThread::PostTask(
         BrowserThread::UI,
         FROM_HERE,
         base::Bind(&UnpackedInstaller::ReportExtensionLoadError, this, error));
@@ skipping 41 matching lines @@
 
   service_weak_->OnExtensionInstalled(
       installer_.extension().get(),
       syncer::StringOrdinal(),
       false /* no requirement errors */,
       NOT_BLACKLISTED,
       false /* don't wait for idle */);
 }
 
 }  // namespace extensions