PlatformThreadHandle: remove public id() interface

base/threading/platform_thread_posix.cc

 // Copyright (c) 2012 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 "base/threading/platform_thread.h"
 
 #include <errno.h>
 #include <pthread.h>
 #include <sched.h>
 #include <sys/resource.h>
@@ skipping 45 matching lines @@
 
   PlatformThread::Delegate* delegate = thread_params->delegate;
   if (!thread_params->joinable)
     base::ThreadRestrictions::SetSingletonAllowed(false);
 
   if (thread_params->priority != ThreadPriority::NORMAL)
     PlatformThread::SetCurrentThreadPriority(thread_params->priority);
 
   // Stash the id in the handle so the calling thread has a complete
   // handle, and unblock the parent thread.
-  *(thread_params->handle) = PlatformThreadHandle(pthread_self(),
-                                                  PlatformThread::CurrentId());
+  *(thread_params->handle) = PlatformThreadHandle(pthread_self());
   thread_params->handle_set.Signal();
 
   ThreadIdNameManager::GetInstance()->RegisterThread(
-      PlatformThread::CurrentHandle().platform_handle(),
-      PlatformThread::CurrentId());
+      PlatformThread::CurrentHandle(), PlatformThread::CurrentId());
 
   delegate->ThreadMain();
 
   ThreadIdNameManager::GetInstance()->RemoveName(
-      PlatformThread::CurrentHandle().platform_handle(),
-      PlatformThread::CurrentId());
+      PlatformThread::CurrentHandle(), PlatformThread::CurrentId());
 
   base::TerminateOnThread();
   return NULL;
 }
 
 bool CreateThread(size_t stack_size, bool joinable,
                   PlatformThread::Delegate* delegate,
                   PlatformThreadHandle* thread_handle,
                   ThreadPriority priority) {
   base::InitThreading();
@@ skipping 33 matching lines @@
     errno = err;
     PLOG(ERROR) << "pthread_create";
   }
 
   pthread_attr_destroy(&attributes);
 
   // Don't let this call complete until the thread id
   // is set in the handle.
   if (success)
     params.handle_set.Wait();
-  CHECK_EQ(handle, thread_handle->platform_handle());
+  CHECK(thread_handle->is_equal(PlatformThreadHandle(handle)));
 
   return success;
 }
 
 }  // namespace
 
 // static
 PlatformThreadId PlatformThread::CurrentId() {
   // Pthreads doesn't have the concept of a thread ID, so we have to reach down
   // into the kernel.
@@ skipping 15 matching lines @@
 #endif
 }
 
 // static
 PlatformThreadRef PlatformThread::CurrentRef() {
   return PlatformThreadRef(pthread_self());
 }
 
 // static
 PlatformThreadHandle PlatformThread::CurrentHandle() {
-  return PlatformThreadHandle(pthread_self(), CurrentId());
+  return PlatformThreadHandle(pthread_self());
 }
 
 // static
 void PlatformThread::YieldCurrentThread() {
   sched_yield();
 }
 
 // static
 void PlatformThread::Sleep(TimeDelta duration) {
   struct timespec sleep_time, remaining;
@@ skipping 40 matching lines @@
                              delegate, &unused, ThreadPriority::NORMAL);
   return result;
 }
 
 // static
 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.
   base::ThreadRestrictions::AssertIOAllowed();
-  CHECK_EQ(0, pthread_join(thread_handle.platform_handle(), NULL));
+  CHECK_EQ(0, pthread_join(thread_handle.handle_, NULL));
 }
 
 // Mac has its own Set/GetCurrentThreadPriority() implementations.
 #if !defined(OS_MACOSX)
 
 // static
 void PlatformThread::SetCurrentThreadPriority(ThreadPriority priority) {
 #if defined(OS_NACL)
   NOTIMPLEMENTED();
 #else
@@ skipping 37 matching lines @@
     return ThreadPriority::NORMAL;
   }
 
   return internal::NiceValueToThreadPriority(nice_value);
 #endif  // !defined(OS_NACL)
 }
 
 #endif  // !defined(OS_MACOSX)
 
 }  // namespace base