Roll base to 5e00da80f6adb7082d1c0e88d3274cf87cc43bc5 and tonic to f7acabb8fa6c91124486a41194eac3cd…

sandbox/linux/services/thread_helpers.cc

 // 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.
 
 #include "sandbox/linux/services/thread_helpers.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <sys/types.h>
@@ skipping 103 matching lines @@
 bool ChangeThreadStateAndWatchProcFS(
     int proc_fd, base::Thread* thread, ThreadAction action) {
   DCHECK_LE(0, proc_fd);
   DCHECK(thread);
   DCHECK(action == ThreadAction::Start || action == ThreadAction::Stop);
 
   base::Callback<bool(void)> cb;
   const char* message;
 
   if (action == ThreadAction::Start) {
-    // Should start the thread before calling thread_id().
+    // Should start the thread before calling GetThreadId().
     if (!thread->Start())
       return false;
   }
 
-  const base::PlatformThreadId thread_id = thread->thread_id();
+  const base::PlatformThreadId thread_id = thread->GetThreadId();
   const std::string thread_id_dir_str =
       "self/task/" + base::IntToString(thread_id) + "/";
 
   if (action == ThreadAction::Stop) {
     // The target thread should exist in /proc.
     DCHECK(IsThreadPresentInProcFS(proc_fd, thread_id_dir_str));
     thread->Stop();
   }
 
   // The kernel is at liberty to wake the thread id futex before updating
@@ skipping 51 matching lines @@
                                              base::Thread* thread) {
   return ChangeThreadStateAndWatchProcFS(proc_fd, thread, ThreadAction::Stop);
 }
 
 // static
 const char* ThreadHelpers::GetAssertSingleThreadedErrorMessageForTests() {
   return kAssertSingleThreadedError;
 }
 
 }  // namespace sandbox