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

chrome/browser/extensions/extension_garbage_collector.cc

 // Copyright 2014 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_garbage_collector.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/sequenced_task_runner.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/pending_extension_manager.h"
-#include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_partition.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/file_util.h"
 
 namespace extensions {
 
 namespace {
 
 // Wait this many seconds before trying to garbage collect extensions again.
 const int kGarbageCollectRetryDelayInSeconds = 30;
 
 // Wait this many seconds after startup to see if there are any extensions
 // which can be garbage collected.
 const int kGarbageCollectStartupDelay = 30;
 
 typedef std::multimap<std::string, base::FilePath> ExtensionPathsMultimap;
 
 void CheckExtensionDirectory(const base::FilePath& path,
                              const ExtensionPathsMultimap& extension_paths,
                              bool clean_temp_dir) {
   base::FilePath basename = path.BaseName();
   // Clean up temporary files left if Chrome crashed or quit in the middle
   // of an extension install.
-  if (basename.value() == extension_file_util::kTempDirectoryName) {
+  if (basename.value() == file_util::kTempDirectoryName) {
     if (clean_temp_dir)
       base::DeleteFile(path, true);  // Recursive.
     return;
   }
 
   // Parse directory name as a potential extension ID.
   std::string extension_id;
   if (IsStringASCII(basename.value())) {
     extension_id = base::UTF16ToASCII(basename.LossyDisplayName());
     if (!Extension::IdIsValid(extension_id))
@@ skipping 183 matching lines @@
 
   extension_service_->OnGarbageCollectIsolatedStorageStart();
   content::BrowserContext::GarbageCollectStoragePartitions(
       context_,
       active_paths.Pass(),
       base::Bind(&ExtensionService::OnGarbageCollectIsolatedStorageFinished,
                  extension_service_->AsWeakPtr()));
 }
 
 }  // namespace extensions