summaryrefslogtreecommitdiffstats
path: root/net/base
diff options
context:
space:
mode:
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;
}