| Index: sandbox/linux/services/thread_helpers.h
|
| diff --git a/sandbox/linux/services/thread_helpers.h b/sandbox/linux/services/thread_helpers.h
|
| index efc24589224e4989f2b1a4bc0cebc0ae4183c053..2915784f1713c9d005c3bc6dad2f283e69432b5c 100644
|
| --- a/sandbox/linux/services/thread_helpers.h
|
| +++ b/sandbox/linux/services/thread_helpers.h
|
| @@ -14,24 +14,23 @@ namespace sandbox {
|
|
|
| class SANDBOX_EXPORT ThreadHelpers {
|
| public:
|
| - // Check whether the current process is single threaded. |proc_self_tasks|
|
| - // must be a file descriptor to /proc/self/task/ and remains owned by the
|
| + // Check whether the current process is single threaded. |proc_fd|
|
| + // must be a file descriptor to /proc/ and remains owned by the
|
| // caller.
|
| - static bool IsSingleThreaded(int proc_self_task);
|
| + static bool IsSingleThreaded(int proc_fd);
|
| 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(int proc_fd);
|
| 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_task,
|
| - base::Thread* thread);
|
| + static bool StopThreadAndWatchProcFS(int proc_fd, base::Thread* thread);
|
|
|
| static const char* GetAssertSingleThreadedErrorMessageForTests();
|
|
|
|
|