Add garbage collection for shared extensions on Chrome OS

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"
@@ skipping 78 matching lines @@
       if (version_dir.BaseName() == iter->second.BaseName()) {
         known_version = true;
         break;
       }
     }
     if (!known_version)
       base::DeleteFile(version_dir, true);  // Recursive.
   }
 }
 
-void GarbageCollectExtensionsOnFileThread(
-    const base::FilePath& install_directory,
-    const ExtensionPathsMultimap& extension_paths) {
-  DCHECK(!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
-
-  // Nothing to clean up if it doesn't exist.
-  if (!base::DirectoryExists(install_directory))
-    return;
-
-  base::FileEnumerator enumerator(install_directory,
-                                  false,  // Not recursive.
-                                  base::FileEnumerator::DIRECTORIES);
-
-  for (base::FilePath extension_path = enumerator.Next();
-       !extension_path.empty();
-       extension_path = enumerator.Next()) {
-    CheckExtensionDirectory(extension_path, extension_paths);
-  }
-}
-
 }  // namespace
 
 ExtensionGarbageCollector::ExtensionGarbageCollector(
     content::BrowserContext* context)
     : context_(context), crx_installs_in_progress_(0), weak_factory_(this) {
-#if defined(OS_CHROMEOS)
-  disable_garbage_collection_ = false;
-#endif
 
   ExtensionSystem* extension_system = ExtensionSystem::Get(context_);
   DCHECK(extension_system);
 
   extension_system->ready().PostDelayed(
       FROM_HERE,
       base::Bind(&ExtensionGarbageCollector::GarbageCollectExtensions,
                  weak_factory_.GetWeakPtr()),
       base::TimeDelta::FromSeconds(kGarbageCollectStartupDelay));
 
@@ skipping 15 matching lines @@
 }
 
 void ExtensionGarbageCollector::Shutdown() {
   InstallTracker::Get(context_)->RemoveObserver(this);
 }
 
 void ExtensionGarbageCollector::GarbageCollectExtensionsForTest() {
   GarbageCollectExtensions();
 }
 
+// static
+void ExtensionGarbageCollector::GarbageCollectExtensionsOnFileThread(
+    const base::FilePath& install_directory,
+    const ExtensionPathsMultimap& extension_paths) {
+  DCHECK(!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+
+  // Nothing to clean up if it doesn't exist.
+  if (!base::DirectoryExists(install_directory))
+    return;
+
+  base::FileEnumerator enumerator(install_directory,
+                                  false,  // Not recursive.
+                                  base::FileEnumerator::DIRECTORIES);
+
+  for (base::FilePath extension_path = enumerator.Next();
+       !extension_path.empty();
+       extension_path = enumerator.Next()) {
+    CheckExtensionDirectory(extension_path, extension_paths);
+  }
+}
+
 void ExtensionGarbageCollector::GarbageCollectExtensions() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
-#if defined(OS_CHROMEOS)
-  if (disable_garbage_collection_)
-    return;
-#endif
-
   ExtensionPrefs* extension_prefs = ExtensionPrefs::Get(context_);
   DCHECK(extension_prefs);
 
   if (extension_prefs->pref_service()->ReadOnly())
     return;
 
   if (crx_installs_in_progress_ > 0) {
     // Don't garbage collect while there are installations in progress,
     // which may be using the temporary installation directory. Try to garbage
     // collect again later.
@@ skipping 92 matching lines @@
     // accounting.
     NOTREACHED();
 
     // Don't let the count go negative to avoid garbage collecting when
     // an install is actually in progress.
     crx_installs_in_progress_ = 0;
   }
 }
 
 }  // namespace extensions