Index: net/base/directory_lister.cc |
diff --git a/net/base/directory_lister.cc b/net/base/directory_lister.cc |
index 0a22d2b4796bd83f42344441da037cc0700f03aa..9c03cf76600b7d0b2f5c7ef8a0d222f2476c20b8 100644 |
--- a/net/base/directory_lister.cc |
+++ b/net/base/directory_lister.cc |
@@ -11,6 +11,7 @@ |
#include "base/i18n/file_util_icu.h" |
#include "base/message_loop.h" |
#include "base/platform_thread.h" |
+#include "base/thread_restrictions.h" |
#include "net/base/net_errors.h" |
namespace net { |
@@ -122,6 +123,9 @@ DirectoryLister::DirectoryLister(const FilePath& dir, |
DirectoryLister::~DirectoryLister() { |
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_); |
} |
} |