Move Thread Name Mapping into ThreadFunc.

base/threading/thread_id_name_manager_unittest.cc

Index: base/threading/thread_id_name_manager_unittest.cc
diff --git a/base/threading/thread_id_name_manager_unittest.cc b/base/threading/thread_id_name_manager_unittest.cc
index 08f1ea705542654f1e18a07d549ee684ccba7d3c..37773018a0ebdfff1888ee11399aa1cf87f2077b 100644
--- a/base/threading/thread_id_name_manager_unittest.cc
+++ b/base/threading/thread_id_name_manager_unittest.cc
@@ -41,9 +41,10 @@ TEST_F(ThreadIdNameManagerTest, RemoveThreads) {
     thread_b.Start();
     thread_b.Stop();
   }
-  thread_a.Stop();
-
   EXPECT_STREQ(kAThread, manager->GetName(thread_a.thread_id()));
+
+  thread_a.Stop();
+  EXPECT_STREQ("", manager->GetName(thread_a.thread_id()));
 }
 
 TEST_F(ThreadIdNameManagerTest, RestartThread) {
@@ -52,12 +53,13 @@ TEST_F(ThreadIdNameManagerTest, RestartThread) {
 
   thread_a.Start();
   base::PlatformThreadId a_id = thread_a.thread_id();
-  thread_a.Stop();
   EXPECT_STREQ(kAThread, manager->GetName(a_id));
+  thread_a.Stop();
 
   thread_a.Start();
+  EXPECT_STREQ("", manager->GetName(a_id));
+  EXPECT_STREQ(kAThread, manager->GetName(thread_a.thread_id()));
   thread_a.Stop();
-  EXPECT_STREQ(kAThread, manager->GetName(a_id));
 }
 
 TEST_F(ThreadIdNameManagerTest, ThreadNameInterning) {