summaryrefslogtreecommitdiffstats
path: root/net/base
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-17 00:00:18 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-17 00:00:18 +0000
commit221f16096fc8c9887ae70b7aa07c31baa6b88c05 (patch)
tree698326322ffbda034013f5d51f8861ed871e45b2 /net/base
parent3ecc019ae1b88ca0f03181538d5b3e6d8c300d87 (diff)
downloadchromium_src-221f16096fc8c9887ae70b7aa07c31baa6b88c05.zip
chromium_src-221f16096fc8c9887ae70b7aa07c31baa6b88c05.tar.gz
chromium_src-221f16096fc8c9887ae70b7aa07c31baa6b88c05.tar.bz2
net::DirectoryLister: mark another buggy use of IO
This code is the same as the previous code in bug 65331, and is also wrong. BUG=65331 Review URL: http://codereview.chromium.org/5876004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69488 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
-rw-r--r--net/base/directory_lister.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/base/directory_lister.cc b/net/base/directory_lister.cc
index 9c03cf7..61a2d65 100644
--- a/net/base/directory_lister.cc
+++ b/net/base/directory_lister.cc
@@ -151,6 +151,9 @@ void DirectoryLister::Cancel() {
canceled_.Set();
if (thread_) {
+ // This is a bug and we should stop joining this thread.
+ // http://crbug.com/65331
+ base::ThreadRestrictions::ScopedAllowIO allow_io;
PlatformThread::Join(thread_);
thread_ = kNullThreadHandle;
}