Remove ThreadWrapper::GetThreadId. The method just calls rtc::CurrentThreadId(), which also has a m…

webrtc/system_wrappers/source/thread_win.cc

 /*
  *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/system_wrappers/source/thread_win.h"
 
 #include <process.h>
 #include <stdio.h>
 #include <windows.h>
 
 #include "webrtc/base/checks.h"
-#include "webrtc/base/platform_thread.h"
 #include "webrtc/system_wrappers/include/trace.h"
 
 namespace webrtc {
 namespace {
 void CALLBACK RaiseFlag(ULONG_PTR param) {
   *reinterpret_cast<bool*>(param) = true;
 }
 }
 
 ThreadWindows::ThreadWindows(ThreadRunFunction func, void* obj,
                              const char* thread_name)
     : run_function_(func),
       obj_(obj),
       stop_(false),
       thread_(NULL),
       name_(thread_name ? thread_name : "webrtc") {
   RTC_DCHECK(func);
 }
 
 ThreadWindows::~ThreadWindows() {
   RTC_DCHECK(main_thread_.CalledOnValidThread());
   RTC_DCHECK(!thread_);
 }
 
 // static
-uint32_t ThreadWrapper::GetThreadId() {
-  return GetCurrentThreadId();
-}
-
-// static
 DWORD WINAPI ThreadWindows::StartThread(void* param) {
   static_cast<ThreadWindows*>(param)->Run();
   return 0;
 }
 
 bool ThreadWindows::Start() {
   RTC_DCHECK(main_thread_.CalledOnValidThread());
   RTC_DCHECK(!thread_);
 
   stop_ = false;
@@ skipping 39 matching lines @@
     // Start, there should be at least one call to the run function.  So we
     // call the function before checking |stop_|.
     if (!run_function_(obj_))
       break;
     // Alertable sleep to permit RaiseFlag to run and update |stop_|.
     SleepEx(0, true);
   } while (!stop_);
 }
 
 }  // namespace webrtc