chromeos: updates remoting thread assertions

The assertions need to allow more.

BUG=944316
TEST=none

Change-Id: I880bba3b34dca412cc0ec0e9c7f08f2cd6cc0851
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1538459
Commit-Queue: Scott Violet <sky@chromium.org>
Commit-Queue: Jamie Walch <jamiewalch@chromium.org>
Auto-Submit: Scott Violet <sky@chromium.org>
Reviewed-by: Jamie Walch <jamiewalch@chromium.org>
Cr-Commit-Position: refs/heads/master@{#644118}

base/threading/thread_restrictions.h

@@ -396,7 +396,6 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives {
   friend class media::BlockingUrlProtocol;
   friend class mojo::core::ScopedIPCSupport;
   friend class net::MultiThreadedCertVerifierScopedAllowBaseSyncPrimitives;
-  friend class remoting::AutoThread;
   friend class rlz_lib::FinancialPing;
   friend class shell_integration_linux::
       LaunchXdgUtilityScopedAllowBaseSyncPrimitives;
@@ -483,6 +482,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitivesOutsideBlockingScope {
   friend class net::
       ScopedAllowThreadJoinForProxyResolverV8Tracing;  // http://crbug.com/69710
   friend class printing::PrinterQuery;                 // http://crbug.com/66082
+  friend class remoting::AutoThread;  // https://crbug.com/944316
   // Not used in production yet, https://crbug.com/844078.
   friend class service_manager::ServiceProcessLauncher;
   friend class ui::WindowResizeHelperMac;  // http://crbug.com/902829

remoting/base/auto_thread.cc

@@ -127,6 +127,8 @@ AutoThread::~AutoThread() {
 
   // Wait for the thread to exit.
   if (!thread_.is_null()) {
+    // TODO(https://crbug.com/id=944316).
+    base::ScopedAllowBaseSyncPrimitivesOutsideBlockingScope allow_wait;
     base::PlatformThread::Join(thread_);
   }
 }
@@ -152,7 +154,8 @@ scoped_refptr<AutoThreadTaskRunner> AutoThread::StartWithType(
   // the thread lifetime is controlled by the AutoThreadTaskRunner, we would
   // ideally return the AutoThreadTaskRunner to the caller without waiting for
   // the thread to signal us.
-  base::ScopedAllowBaseSyncPrimitives allow_wait;
+  // TODO(https://crbug.com/id=944316).
+  base::ScopedAllowBaseSyncPrimitivesOutsideBlockingScope allow_wait;
   startup_data.event.Wait();
 
   // set it to NULL so we don't keep a pointer to some object on the stack.