Resubmit: Remove ExtensionService Garbage-Collecting methods.

chrome/browser/extensions/extension_garbage_collector.cc

Index: chrome/browser/extensions/extension_garbage_collector.cc
diff --git a/chrome/browser/extensions/extension_garbage_collector.cc b/chrome/browser/extensions/extension_garbage_collector.cc
new file mode 100644
index 0000000000000000000000000000000000000000..78ddd1398c54204fddf56128957715abaeb752a2
--- /dev/null
+++ b/chrome/browser/extensions/extension_garbage_collector.cc
@@ -0,0 +1,252 @@
+// 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"
+
+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 (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))
+      extension_id.clear();
+  }
+
+  // Delete directories that aren't valid IDs.
+  if (extension_id.empty()) {
+    base::DeleteFile(path, true);  // Recursive.
+    return;
+  }
+
+  typedef ExtensionPathsMultimap::const_iterator Iter;
+  std::pair<Iter, Iter> iter_pair = extension_paths.equal_range(extension_id);
+
+  // If there is no entry in the prefs file, just delete the directory and
+  // move on. This can legitimately happen when an uninstall does not
+  // complete, for example, when a plugin is in use at uninstall time.
+  if (iter_pair.first == iter_pair.second) {
+    base::DeleteFile(path, true);  // Recursive.
+    return;
+  }
+
+  // Clean up old version directories.
+  base::FileEnumerator versions_enumerator(
+      path, false /* Not recursive */, base::FileEnumerator::DIRECTORIES);
+  for (base::FilePath version_dir = versions_enumerator.Next();
+       !version_dir.empty();
+       version_dir = versions_enumerator.Next()) {
+    bool known_version = false;
+    for (Iter iter = iter_pair.first; iter != iter_pair.second; ++iter) {
+      if (version_dir.BaseName() == iter->second.BaseName()) {
+        known_version = true;
+        break;
+      }
+    }
+    if (!known_version)
+      base::DeleteFile(version_dir, true);  // Recursive.
+  }
+}
+
+void GarbageCollectExtensionsOnFileThread(

[Devlin, 2014/03/28 22:42:44]

Difference 1: We now call this without a WeakPtr to ExtensionGarbageCollector,
and just pass in the install dir.

+    const base::FilePath& install_directory,
+    const ExtensionPathsMultimap& extension_paths,
+    bool clean_temp_dir) {
+  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, clean_temp_dir);
+  }
+}
+
+}  // namespace
+
+ExtensionGarbageCollector::ExtensionGarbageCollector(
+    ExtensionService* extension_service)
+    : extension_service_(extension_service),
+      context_(extension_service->GetBrowserContext()),
+      install_directory_(extension_service->install_directory()),
+      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));
+
+  extension_system->ready().Post(
+      FROM_HERE,
+      base::Bind(
+          &ExtensionGarbageCollector::GarbageCollectIsolatedStorageIfNeeded,
+          weak_factory_.GetWeakPtr()));
+}
+
+ExtensionGarbageCollector::~ExtensionGarbageCollector() {}
+
+void ExtensionGarbageCollector::GarbageCollectExtensionsForTest() {
+  GarbageCollectExtensions();
+}
+
+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;
+
+  bool clean_temp_dir = true;
+
+  if (extension_service_->pending_extension_manager()->HasPendingExtensions()) {
+    // Don't garbage collect temp dir while there are pending installations,
+    // which may be using the temporary installation directory. Try to garbage
+    // collect again later.
+    clean_temp_dir = false;
+    base::MessageLoop::current()->PostDelayedTask(
+        FROM_HERE,
+        base::Bind(&ExtensionGarbageCollector::GarbageCollectExtensions,
+                   weak_factory_.GetWeakPtr()),
+        base::TimeDelta::FromSeconds(kGarbageCollectRetryDelayInSeconds));
+  }
+
+  scoped_ptr<ExtensionPrefs::ExtensionsInfo> info(
+      extension_prefs->GetInstalledExtensionsInfo());
+  std::multimap<std::string, base::FilePath> extension_paths;
+  for (size_t i = 0; i < info->size(); ++i) {
+    extension_paths.insert(
+        std::make_pair(info->at(i)->extension_id, info->at(i)->extension_path));
+  }
+
+  info = extension_prefs->GetAllDelayedInstallInfo();
+  for (size_t i = 0; i < info->size(); ++i) {
+    extension_paths.insert(
+        std::make_pair(info->at(i)->extension_id, info->at(i)->extension_path));
+  }
+
+  if (!extension_service_->GetFileTaskRunner()->PostTask(
+          FROM_HERE,
+          base::Bind(
+              &GarbageCollectExtensionsOnFileThread,
+              install_directory_,
+              extension_paths,
+              clean_temp_dir))) {
+    NOTREACHED();
+  }
+}
+
+void ExtensionGarbageCollector::GarbageCollectIsolatedStorageIfNeeded() {
+  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+
+  ExtensionPrefs* extension_prefs = ExtensionPrefs::Get(context_);
+  DCHECK(extension_prefs);
+  if (!extension_prefs->NeedsStorageGarbageCollection())
+    return;
+  extension_prefs->SetNeedsStorageGarbageCollection(false);
+
+  scoped_ptr<base::hash_set<base::FilePath> > active_paths(
+      new base::hash_set<base::FilePath>());
+  const ExtensionSet& extensions =
+      ExtensionRegistry::Get(context_)->enabled_extensions();
+  for (ExtensionSet::const_iterator iter = extensions.begin();
+       iter != extensions.end();
+       ++iter) {
+    if (AppIsolationInfo::HasIsolatedStorage(iter->get())) {
+      active_paths->insert(
+          content::BrowserContext::GetStoragePartitionForSite(
+              context_, util::GetSiteForExtensionId((*iter)->id(), context_))
+              ->GetPath());
+    }
+  }
+
+  // The data of ephemeral apps can outlive their cache lifetime. Ensure
+  // they are not garbage collected.
+  scoped_ptr<ExtensionPrefs::ExtensionsInfo> evicted_apps_info(
+      extension_prefs->GetEvictedEphemeralAppsInfo());
+  for (size_t i = 0; i < evicted_apps_info->size(); ++i) {
+    ExtensionInfo* info = evicted_apps_info->at(i).get();
+    if (util::HasIsolatedStorage(*info)) {
+      active_paths->insert(content::BrowserContext::GetStoragePartitionForSite(
+                               context_,
+                               util::GetSiteForExtensionId(
+                                   info->extension_id, context_))->GetPath());
+    }
+  }
+
+  extension_service_->OnGarbageCollectIsolatedStorageStart();
+  content::BrowserContext::GarbageCollectStoragePartitions(
+      context_,
+      active_paths.Pass(),
+      base::Bind(&ExtensionService::OnGarbageCollectIsolatedStorageFinished,
+                 extension_service_->AsWeakPtr()));
+}
+
+}  // namespace extensions