PlatformThreadHandle: remove public id() interface

base/threading/thread_id_name_manager.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/thread_id_name_manager.h"
 
 #include <stdlib.h>
 #include <string.h>
 
 #include "base/logging.h"
@@ skipping 22 matching lines @@
 
 ThreadIdNameManager* ThreadIdNameManager::GetInstance() {
   return Singleton<ThreadIdNameManager,
       LeakySingletonTraits<ThreadIdNameManager> >::get();
 }
 
 const char* ThreadIdNameManager::GetDefaultInternedString() {
   return g_default_name->c_str();
 }
 
-void ThreadIdNameManager::RegisterThread(PlatformThreadHandle::Handle handle,
+void ThreadIdNameManager::RegisterThread(PlatformThreadHandle handle,
                                          PlatformThreadId id) {
   AutoLock locked(lock_);
-  thread_id_to_handle_[id] = handle;
-  thread_handle_to_interned_name_[handle] =
+  thread_id_to_handle_[id] = handle.handle_;
+  thread_handle_to_interned_name_[handle.handle_] =
       name_to_interned_name_[kDefaultName];
 }
 
 void ThreadIdNameManager::SetName(PlatformThreadId id,
                                   const std::string& name) {
   AutoLock locked(lock_);
   NameToInternedNameMap::iterator iter = name_to_interned_name_.find(name);
   std::string* leaked_str = NULL;
   if (iter != name_to_interned_name_.end()) {
     leaked_str = iter->second;
@@ skipping 24 matching lines @@
   ThreadIdToHandleMap::iterator id_to_handle_iter =
       thread_id_to_handle_.find(id);
   if (id_to_handle_iter == thread_id_to_handle_.end())
     return name_to_interned_name_[kDefaultName]->c_str();
 
   ThreadHandleToInternedNameMap::iterator handle_to_name_iter =
       thread_handle_to_interned_name_.find(id_to_handle_iter->second);
   return handle_to_name_iter->second->c_str();
 }
 
-void ThreadIdNameManager::RemoveName(PlatformThreadHandle::Handle handle,
+void ThreadIdNameManager::RemoveName(PlatformThreadHandle handle,
                                      PlatformThreadId id) {
   AutoLock locked(lock_);
   ThreadHandleToInternedNameMap::iterator handle_to_name_iter =
-      thread_handle_to_interned_name_.find(handle);
+      thread_handle_to_interned_name_.find(handle.handle_);
 
   DCHECK(handle_to_name_iter != thread_handle_to_interned_name_.end());
   thread_handle_to_interned_name_.erase(handle_to_name_iter);
 
   ThreadIdToHandleMap::iterator id_to_handle_iter =
       thread_id_to_handle_.find(id);
   DCHECK((id_to_handle_iter!= thread_id_to_handle_.end()));
   // The given |id| may have been re-used by the system. Make sure the
   // mapping points to the provided |handle| before removal.
-  if (id_to_handle_iter->second != handle)
+  if (id_to_handle_iter->second != handle.handle_)
     return;
 
   thread_id_to_handle_.erase(id_to_handle_iter);
 }
 
 }  // namespace base