PlatformThreadHandle: remove public id() interface

base/threading/thread.cc

Index: base/threading/thread.cc
diff --git a/base/threading/thread.cc b/base/threading/thread.cc
index 6ca1caea099d344fa5c44cebd7310bd5c7078777..381bb4be9fa24633d409ec18fb5802da3b8d221a 100644
--- a/base/threading/thread.cc
+++ b/base/threading/thread.cc
@@ -62,6 +62,7 @@ Thread::Thread(const std::string& name)
       stopping_(false),
       running_(false),
       thread_(0),
+      id_(kInvalidThreadId),
       message_loop_(nullptr),
       message_loop_timer_slack_(TIMER_SLACK_NONE),
       name_(name) {
@@ -172,11 +173,6 @@ void Thread::StopSoon() {
   task_runner()->PostTask(FROM_HERE, base::Bind(&ThreadQuitHelper));
 }
 
-PlatformThreadId Thread::thread_id() const {
-  AutoLock lock(thread_lock_);
-  return thread_.id();
-}
-
 bool Thread::IsRunning() const {
   // If the thread's already started (i.e. message_loop_ is non-null) and
   // not yet requested to stop (i.e. stopping_ is false) we can just return
@@ -208,6 +204,7 @@ bool Thread::GetThreadWasQuitProperly() {
 
 void Thread::ThreadMain() {
   // Complete the initialization of our Thread object.
+  id_ = PlatformThread::CurrentId();
   PlatformThread::SetName(name_.c_str());
   ANNOTATE_THREAD_NAME(name_.c_str());  // Tell the name to race detector.
 
@@ -227,10 +224,6 @@ void Thread::ThreadMain() {
   }
 #endif
 
-  // Make sure the thread_id() returns current thread.
-  // (This internally acquires lock against PlatformThread::Create)
-  DCHECK_EQ(thread_id(), PlatformThread::CurrentId());
-
   // Let the thread do extra initialization.
   Init();