summaryrefslogtreecommitdiffstats
path: root/chrome/browser/renderer_host/resource_queue.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-10 19:26:59 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-10 19:26:59 +0000
commitbf73f0bc6e83da6c7b4f9353be5b382ea91e6906 (patch)
tree474e26033ecc422393c79a02a8e7a7f8db83dee8 /chrome/browser/renderer_host/resource_queue.cc
parent5c60cd093c8df908383b143a2c946670a1d08d44 (diff)
downloadchromium_src-bf73f0bc6e83da6c7b4f9353be5b382ea91e6906.zip
chromium_src-bf73f0bc6e83da6c7b4f9353be5b382ea91e6906.tar.gz
chromium_src-bf73f0bc6e83da6c7b4f9353be5b382ea91e6906.tar.bz2
Make sure that ResourceQueue is shut down before destruction.
Rewrite UserScriptListener unit test to not use ResourceDispatcherHost. Share more code with ExtensionsServiceTest. TEST=Covered by unit_tests. BUG=none Review URL: http://codereview.chromium.org/601005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38648 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host/resource_queue.cc')
-rw-r--r--chrome/browser/renderer_host/resource_queue.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/renderer_host/resource_queue.cc b/chrome/browser/renderer_host/resource_queue.cc
index 409f6b9..dca6bd2 100644
--- a/chrome/browser/renderer_host/resource_queue.cc
+++ b/chrome/browser/renderer_host/resource_queue.cc
@@ -17,8 +17,7 @@ ResourceQueue::ResourceQueue() : shutdown_(false) {
}
ResourceQueue::~ResourceQueue() {
- // TODO(phajdan.jr): Add DCHECK(shutdown_) here when unit tests stop abusing
- // ResourceDispatcherHost by not shutting it down in tests.
+ DCHECK(shutdown_);
}
void ResourceQueue::Initialize(const DelegateSet& delegates) {