Update from https://crrev.com/316786

sandbox/linux/services/thread_helpers.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef SANDBOX_LINUX_SERVICES_THREAD_HELPERS_H_
 #define SANDBOX_LINUX_SERVICES_THREAD_HELPERS_H_
 
 #include "base/basictypes.h"
 #include "sandbox/sandbox_export.h"
 
 namespace base { class Thread; }
 
 namespace sandbox {
 
 class SANDBOX_EXPORT ThreadHelpers {
  public:
   // Check whether the current process is single threaded. |proc_self_tasks|
-  // can be a file descriptor to /proc/self/task/ and remains owned by the
-  // caller or -1.
-  // If |proc_self_tasks| is -1, this method will open /proc/self/task/ and
-  // crash if it cannot.
+  // must be a file descriptor to /proc/self/task/ and remains owned by the
+  // caller.
   static bool IsSingleThreaded(int proc_self_task);
+  static bool IsSingleThreaded();
+
+  // Crash if the current process is not single threaded. This will wait
+  // on /proc to be updated. In the case where this doesn't crash, this will
+  // return promptly. In the case where this does crash, this will first wait
+  // for a few ms in Debug mode, a few seconds in Release mode.
+  static void AssertSingleThreaded(int proc_self_task);
+  static void AssertSingleThreaded();
 
   // Stop |thread| and ensure that it does not have an entry in
   // /proc/self/task/ from the point of view of the current thread. This is
   // the way to stop threads before calling IsSingleThreaded().
-  static bool StopThreadAndWatchProcFS(int proc_self_tasks,
+  static bool StopThreadAndWatchProcFS(int proc_self_task,
                                        base::Thread* thread);
 
+  static const char* GetAssertSingleThreadedErrorMessageForTests();
+
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(ThreadHelpers);
 };
 
 }  // namespace sandbox
 
 #endif  // SANDBOX_LINUX_SERVICES_THREAD_HELPERS_H_