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

chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.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/chromeos/kiosk_mode/kiosk_mode_screensaver.h"
 
 #include "ash/screensaver/screensaver_view.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
 #include "chrome/browser/chromeos/policy/app_pack_updater.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/extensions/extension_garbage_collector.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/sandboxed_unpacker.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
-#include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "chromeos/login/login_state.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/file_util.h"
 #include "ui/wm/core/user_activity_detector.h"
 
 using extensions::Extension;
 using extensions::SandboxedUnpacker;
 
 namespace chromeos {
 
 namespace {
 
 ExtensionService* GetDefaultExtensionService() {
@@ skipping 65 matching lines @@
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
 
   ExtensionService* service = GetDefaultExtensionService();
   // TODO(rkc): This is a HACK, please remove this method from extension
   // service once this code is deprecated. See crbug.com/280363
   if (service)
     service->garbage_collector()->disable_garbage_collection();
 
   std::string error;
   scoped_refptr<Extension> screensaver_extension =
-      extension_file_util::LoadExtension(screensaver_extension_path,
-                                         extensions::Manifest::COMPONENT,
-                                         Extension::NO_FLAGS,
-                                         &error);
+      extensions::file_util::LoadExtension(screensaver_extension_path,
+                                           extensions::Manifest::COMPONENT,
+                                           Extension::NO_FLAGS,
+                                           &error);
   if (!screensaver_extension.get()) {
     LOG(ERROR) << "Could not load screensaver extension from: "
                << screensaver_extension_path.value() << " due to: " << error;
     NotifyAppPackOfDamagedFile();
     return;
   }
 
   content::BrowserThread::PostTask(
       content::BrowserThread::UI,
       FROM_HERE,
@@ skipping 47 matching lines @@
     // TODO(rkc): This is a HACK, please remove this method from extension
     // service once this code is deprecated. See crbug.com/280363
     if (service)
       service->garbage_collector()->enable_garbage_collection();
 
     // Delete it.
     content::BrowserThread::PostTask(
         content::BrowserThread::FILE,
         FROM_HERE,
         base::Bind(
-            &extension_file_util::DeleteFile, extension_base_path_, true));
+            &extensions::file_util::DeleteFile, extension_base_path_, true));
   }
 
   // In case we're shutting down without ever triggering the active
   // notification and/or logging in.
   if (ash::Shell::GetInstance() &&
       ash::Shell::GetInstance()->user_activity_detector() &&
       ash::Shell::GetInstance()->user_activity_detector()->HasObserver(this))
     ash::Shell::GetInstance()->user_activity_detector()->RemoveObserver(this);
 }
 
@@ skipping 101 matching lines @@
 
   g_kiosk_mode_screensaver = new KioskModeScreensaver();
 }
 
 void ShutdownKioskModeScreensaver() {
   delete g_kiosk_mode_screensaver;
   g_kiosk_mode_screensaver = NULL;
 }
 
 }  // namespace chromeos