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

webrtc/system_wrappers/source/trace_impl.cc

 /*
  *  Copyright (c) 2012 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/trace_impl.h"
 
 #include <assert.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 
 #include "webrtc/base/atomicops.h"
+#include "webrtc/base/platform_thread.h"
 #ifdef _WIN32
 #include "webrtc/system_wrappers/source/trace_win.h"
 #else
 #include "webrtc/system_wrappers/source/trace_posix.h"
 #endif  // _WIN32
 
 #define KEY_LEN_CHARS 31
 
 #ifdef _WIN32
 #pragma warning(disable:4355)
@@ skipping 40 matching lines @@
       file_count_text_(0),
       trace_file_(FileWrapper::Create()) {
 }
 
 TraceImpl::~TraceImpl() {
   trace_file_->Flush();
   trace_file_->CloseFile();
 }
 
 int32_t TraceImpl::AddThreadId(char* trace_message) const {
-  uint32_t thread_id = ThreadWrapper::GetThreadId();
+  uint32_t thread_id = rtc::CurrentThreadId();
   // Messages is 12 characters.
   return sprintf(trace_message, "%10u; ", thread_id);
 }
 
 int32_t TraceImpl::AddLevel(char* sz_message, const TraceLevel level) const {
   const int kMessageLength = 12;
   switch (level) {
     case kTraceTerseInfo:
       // Add the appropriate amount of whitespace.
       memset(sz_message, ' ', kMessageLength);
@@ skipping 505 matching lines @@
         va_end(args);
         buff = temp_buff;
       }
       trace->AddImpl(level, module, id, buff);
     }
     ReturnTrace();
   }
 }
 
 }  // namespace webrtc