3 files changed, 2 insertions, 5 deletions
diff --git a/base/threading/platform_thread_posix.cc b/base/threading/platform_thread_posix.cc
index 772d1f2..55b3f69 100644
--- a/base/threading/platform_thread_posix.cc
+++ b/base/threading/platform_thread_posix.cc
@@ -13,7 +13,6 @@
 #include "base/safe_strerror_posix.h"
 #include "base/threading/thread_local.h"
 #include "base/threading/thread_restrictions.h"
-#include "base/tracked_objects.h"
 
 #if defined(OS_MACOSX)
 #include <mach/mach.h>
@@ -176,7 +175,6 @@ void PlatformThread::SetName(const char* name) {
   // have to cast away const because ThreadLocalPointer does not support const
   // void*
   current_thread_name.Pointer()->Set(const_cast<char*>(name));
-  tracked_objects::ThreadData::InitializeThreadContext(name);
 
   // http://0pointer.de/blog/projects/name-your-threads.html
 
@@ -212,7 +210,6 @@ void PlatformThread::SetName(const char* name) {
   // have to cast away const because ThreadLocalPointer does not support const
   // void*
   current_thread_name.Pointer()->Set(const_cast<char*>(name));
-  tracked_objects::ThreadData::InitializeThreadContext(name);
 
   // (This should be relatively simple to implement for the BSDs; I
   // just don't have one handy to test the code on.)
diff --git a/base/threading/platform_thread_win.cc b/base/threading/platform_thread_win.cc
index 4feec0c..03e0831 100644
--- a/base/threading/platform_thread_win.cc
+++ b/base/threading/platform_thread_win.cc
@@ -8,7 +8,6 @@
 #include "base/logging.h"
 #include "base/threading/thread_local.h"
 #include "base/threading/thread_restrictions.h"
-#include "base/tracked_objects.h"
 
 #include "base/win/windows_version.h"
 
@@ -101,7 +100,6 @@ void PlatformThread::Sleep(int duration_ms) {
 // static
 void PlatformThread::SetName(const char* name) {
   current_thread_name.Set(const_cast<char*>(name));
-  tracked_objects::ThreadData::InitializeThreadContext(name);
 
   // The debugger needs to be around to catch the name in the exception.  If
   // there isn't a debugger, we are just needlessly throwing an exception.
diff --git a/base/threading/thread.cc b/base/threading/thread.cc
index 616aac8..d49f247 100644
--- a/base/threading/thread.cc
+++ b/base/threading/thread.cc
@@ -8,6 +8,7 @@
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
 #include "base/threading/thread_local.h"
 #include "base/synchronization/waitable_event.h"
+#include "base/tracked_objects.h"
 
 namespace base {
 
@@ -151,6 +152,7 @@ void Thread::ThreadMain() {
     ANNOTATE_THREAD_NAME(name_.c_str());  // Tell the name to race detector.
     message_loop.set_thread_name(name_);
     message_loop_ = &message_loop;
+    tracked_objects::ThreadData::InitializeThreadContext(name_);
 
     // Let the thread do extra initialization.
     // Let's do this before signaling we are started.