summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-09 19:21:47 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-09 19:21:47 +0000
commit8c80e993119b8b5eac5761aae52536f6a064fd9c (patch)
treeb462d9a143a69fe6134f0dc36fcfad257c689d98 /chrome
parent7273652e416b80be8b3c877d2108c444dd6f6031 (diff)
downloadchromium_src-8c80e993119b8b5eac5761aae52536f6a064fd9c.zip
chromium_src-8c80e993119b8b5eac5761aae52536f6a064fd9c.tar.gz
chromium_src-8c80e993119b8b5eac5761aae52536f6a064fd9c.tar.bz2
Revert "Always destroy the ExtensionsService on UI thread."
It introduced memory leaks in tests. I have to ensure that all message loops run pending tasks to guarantee that ExtensionsService will be destroyed. TBR=erikkay Review URL: http://codereview.chromium.org/377034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31458 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/extensions/extensions_service.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/chrome/browser/extensions/extensions_service.h b/chrome/browser/extensions/extensions_service.h
index b5aad76..60b17c3 100644
--- a/chrome/browser/extensions/extensions_service.h
+++ b/chrome/browser/extensions/extensions_service.h
@@ -17,7 +17,6 @@
#include "base/task.h"
#include "base/tuple.h"
#include "base/values.h"
-#include "chrome/browser/chrome_thread.h"
#include "chrome/browser/extensions/extension_prefs.h"
#include "chrome/browser/extensions/extension_process_manager.h"
#include "chrome/browser/extensions/external_extension_provider.h"
@@ -54,8 +53,7 @@ class ExtensionUpdateService {
// Manages installed and running Chromium extensions.
class ExtensionsService
- : public base::RefCountedThreadSafe<ExtensionsService,
- ChromeThread::DeleteOnUIThread>,
+ : public base::RefCountedThreadSafe<ExtensionsService>,
public BlacklistPathProvider,
public ExtensionUpdateService,
public NotificationObserver {
@@ -236,8 +234,7 @@ class ExtensionsService
const NotificationDetails& details);
private:
- friend class ChromeThread;
- friend class DeleteTask<ExtensionsService>;
+ friend class base::RefCountedThreadSafe<ExtensionsService>;
virtual ~ExtensionsService();