[PlatformThread] Mark PlatformThread::Join as blocking on Windows as well.

Aligning with the POSIX impl in preparation for
https://chromium-review.googlesource.com/c/chromium/src/+/1283010

Also adds two trivial ScopedAllowBaseSyncPrimitivesForTesting around
existing thread joins in tests (more advanced changes were extracted
to precursor CLs).

Bug: 707362
Change-Id: If4c4c49b4a20554518ca4a25ae1ea16b84d3a510
Reviewed-on: https://chromium-review.googlesource.com/c/1324370
Commit-Queue: Gabriel Charette <gab@chromium.org>
Reviewed-by: Bret Sepulveda <bsep@chromium.org>
Reviewed-by: kylechar <kylechar@chromium.org>
Reviewed-by: Ryan Hamilton <rch@chromium.org>
Cr-Commit-Position: refs/heads/master@{#609013}

base/threading/platform_thread_posix.cc

@@ -264,6 +264,8 @@ void PlatformThread::Join(PlatformThreadHandle thread_handle) {
   // 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.
+  // TODO(https://crbug.com/707362): Make this a
+  // ScopedBlockingCallWithBaseSyncPrimitives.
   base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::MAY_BLOCK);
   CHECK_EQ(0, pthread_join(thread_handle.platform_handle(), nullptr));
 }

base/threading/platform_thread_win.cc

@@ -12,6 +12,7 @@
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/threading/scoped_blocking_call.h"
 #include "base/threading/thread_id_name_manager.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/win/scoped_handle.h"
@@ -259,12 +260,6 @@ bool PlatformThread::CreateNonJoinableWithPriority(size_t stack_size,
 // static
 void PlatformThread::Join(PlatformThreadHandle thread_handle) {
   DCHECK(thread_handle.platform_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.
-  // AssertBlockingAllowedDeprecated();
 
   DWORD thread_id = 0;
   thread_id = ::GetThreadId(thread_handle.platform_handle());
@@ -279,6 +274,10 @@ void PlatformThread::Join(PlatformThreadHandle thread_handle) {
   // Record the event that this thread is blocking upon (for hang diagnosis).
   base::debug::ScopedThreadJoinActivity thread_activity(&thread_handle);
 
+  // TODO(https://crbug.com/707362): Make this a
+  // ScopedBlockingCallWithBaseSyncPrimitives.
+  base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::MAY_BLOCK);
+
   // Wait for the thread to exit.  It should already have terminated but make
   // sure this assumption is valid.
   CHECK_EQ(WAIT_OBJECT_0,

chrome/browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc

@@ -11,6 +11,7 @@
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/threading/thread_restrictions.h"
 #include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
@@ -124,6 +125,7 @@ void ToolbarViewInteractiveUITest::TestWhileInDragOperation() {
 
 void ToolbarViewInteractiveUITest::FinishDragAndDrop(
     base::Closure quit_closure) {
+  base::ScopedAllowBlockingForTesting allow_thread_join;
   dnd_thread_.reset();
   TestWhileInDragOperation();
   ui_controls::SendMouseEventsNotifyWhenDone(ui_controls::LEFT, ui_controls::UP,

net/test/spawned_test_server/local_test_server_win.cc

@@ -19,6 +19,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/thread.h"
+#include "base/threading/thread_restrictions.h"
 #include "base/win/scoped_handle.h"
 #include "net/test/python_utils.h"
 
@@ -71,7 +72,9 @@ bool ReadData(HANDLE read_fd,
     bytes_read += num_bytes;
   }
 
+  base::ScopedAllowBlockingForTesting allow_thread_join;
   thread.Stop();
+
   // If the timeout kicked in, abort.
   if (unblocked) {
     LOG(ERROR) << "Timeout exceeded for ReadData";