Reland r68893 after fixing allowing blocking IO on shutdown.

base/platform_thread_win.cc

Index: base/platform_thread_win.cc
diff --git a/base/platform_thread_win.cc b/base/platform_thread_win.cc
index e5afc52e6ff0d51e8cdbe4fdc77a92e9865d0f82..ac8a5db68d989d380e217fa3c71229cfd5a78a94 100644
--- a/base/platform_thread_win.cc
+++ b/base/platform_thread_win.cc
@@ -125,6 +125,14 @@ bool PlatformThread::CreateNonJoinable(size_t stack_size, Delegate* delegate) {
 // static
 void PlatformThread::Join(PlatformThreadHandle thread_handle) {
   DCHECK(thread_handle);
+  // TODO(willchan): Enable this check once I can get it to work for Windows
+  // shutdown.
+  // Joining another thread may block the current thread for a long time, since
+  // the thread referred to by |thread_handle| may still be running long-lived /
+  // blocking tasks.
+#if 0
+  base::ThreadRestrictions::AssertIOAllowed();
+#endif
 
   // Wait for the thread to exit.  It should already have terminated but make
   // sure this assumption is valid.