| 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 b5953d5d4d028505f67df11e68ba02ec48f5f1f0..72ad18b20934034d33bea647520b7278628f8cc3 100644
|
| --- a/base/threading/thread_id_name_manager_unittest.cc
|
| +++ b/base/threading/thread_id_name_manager_unittest.cc
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "base/threading/thread_id_name_manager.h"
|
|
|
| +#include "base/synchronization/waitable_event.h"
|
| #include "base/threading/platform_thread.h"
|
| #include "base/threading/thread.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| @@ -21,8 +22,8 @@ TEST_F(ThreadIdNameManagerTest, AddThreads) {
|
| base::Thread thread_a(kAThread);
|
| base::Thread thread_b(kBThread);
|
|
|
| - thread_a.Start();
|
| - thread_b.Start();
|
| + thread_a.StartAndWait();
|
| + thread_b.StartAndWait();
|
|
|
| EXPECT_STREQ(kAThread, manager->GetName(thread_a.thread_id()));
|
| EXPECT_STREQ(kBThread, manager->GetName(thread_b.thread_id()));
|
| @@ -35,10 +36,10 @@ TEST_F(ThreadIdNameManagerTest, RemoveThreads) {
|
| base::ThreadIdNameManager* manager = base::ThreadIdNameManager::GetInstance();
|
| base::Thread thread_a(kAThread);
|
|
|
| - thread_a.Start();
|
| + thread_a.StartAndWait();
|
| {
|
| base::Thread thread_b(kBThread);
|
| - thread_b.Start();
|
| + thread_b.StartAndWait();
|
| thread_b.Stop();
|
| }
|
| EXPECT_STREQ(kAThread, manager->GetName(thread_a.thread_id()));
|
| @@ -51,12 +52,12 @@ TEST_F(ThreadIdNameManagerTest, RestartThread) {
|
| base::ThreadIdNameManager* manager = base::ThreadIdNameManager::GetInstance();
|
| base::Thread thread_a(kAThread);
|
|
|
| - thread_a.Start();
|
| + thread_a.StartAndWait();
|
| base::PlatformThreadId a_id = thread_a.thread_id();
|
| EXPECT_STREQ(kAThread, manager->GetName(a_id));
|
| thread_a.Stop();
|
|
|
| - thread_a.Start();
|
| + thread_a.StartAndWait();
|
| EXPECT_STREQ("", manager->GetName(a_id));
|
| EXPECT_STREQ(kAThread, manager->GetName(thread_a.thread_id()));
|
| thread_a.Stop();
|
|
|