Revert 273763 "Add garbage collection for shared extensions on C..."

trunk/src/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/ui/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_chromeos.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/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::ExtensionGarbageCollectorChromeOS;
+using extensions::ExtensionGarbageCollector;
 using extensions::SandboxedUnpacker;
 
 namespace chromeos {
 
 namespace {
 
 ExtensionService* GetDefaultExtensionService() {
   Profile* default_profile = ProfileHelper::GetSigninProfile();
   if (!default_profile)
     return NULL;
   return extensions::ExtensionSystem::Get(
       default_profile)->extension_service();
 }
 
-ExtensionGarbageCollectorChromeOS* GetDefaultExtensionGarbageCollector() {
+ExtensionGarbageCollector* GetDefaultExtensionGarbageCollector() {
   Profile* default_profile = ProfileHelper::GetSigninProfile();
   if (!default_profile)
     return NULL;
-  return ExtensionGarbageCollectorChromeOS::Get(default_profile);
+  return ExtensionGarbageCollector::Get(default_profile);
 }
 
 typedef base::Callback<void(
     scoped_refptr<Extension>,
     const base::FilePath&)> UnpackCallback;
 
 class ScreensaverUnpackerClient
     : public extensions::SandboxedUnpackerClient {
  public:
   ScreensaverUnpackerClient(const base::FilePath& crx_path,
@@ skipping 44 matching lines @@
   NotifyAppPackOfDamagedFile();
 }
 
 void ScreensaverUnpackerClient::LoadScreensaverExtension(
     const base::FilePath& extension_base_path,
     const base::FilePath& screensaver_extension_path) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
 
   // TODO(rkc): This is a HACK, please remove this method from extension
   // service once this code is deprecated. See crbug.com/280363
-  ExtensionGarbageCollectorChromeOS* gc = GetDefaultExtensionGarbageCollector();
+  ExtensionGarbageCollector* gc = GetDefaultExtensionGarbageCollector();
   if (gc)
     gc->disable_garbage_collection();
 
   std::string error;
   scoped_refptr<Extension> screensaver_extension =
       extensions::file_util::LoadExtension(screensaver_extension_path,
                                            extensions::Manifest::COMPONENT,
                                            Extension::NO_FLAGS,
                                            &error);
   if (!screensaver_extension.get()) {
@@ skipping 47 matching lines @@
 KioskModeScreensaver::~KioskModeScreensaver() {
   // If we are shutting down the system might already be gone and we shouldn't
   // do anything (see crbug.com/288216).
   if (!g_browser_process || g_browser_process->IsShuttingDown())
     return;
 
   // If the extension was unpacked.
   if (!extension_base_path_.empty()) {
     // TODO(rkc): This is a HACK, please remove this method from extension
     // service once this code is deprecated. See crbug.com/280363
-    ExtensionGarbageCollectorChromeOS* gc =
-        GetDefaultExtensionGarbageCollector();
+    ExtensionGarbageCollector* gc = GetDefaultExtensionGarbageCollector();
     if (gc)
       gc->enable_garbage_collection();
 
     // Delete it.
     content::BrowserThread::PostTask(
         content::BrowserThread::FILE,
         FROM_HERE,
         base::Bind(
             &extensions::file_util::DeleteFile, extension_base_path_, true));
   }
@@ skipping 110 matching lines @@
 
   g_kiosk_mode_screensaver = new KioskModeScreensaver();
 }
 
 void ShutdownKioskModeScreensaver() {
   delete g_kiosk_mode_screensaver;
   g_kiosk_mode_screensaver = NULL;
 }
 
 }  // namespace chromeos