| Index: runtime/vm/timeline_test.cc
 | 
| diff --git a/runtime/vm/timeline_test.cc b/runtime/vm/timeline_test.cc
 | 
| index a91ea6e4bc8b15dd558dd0cceb46e5cec41b16ef..69db5bf3c9c12153057846c5bf81cbc5dace5d48 100644
 | 
| --- a/runtime/vm/timeline_test.cc
 | 
| +++ b/runtime/vm/timeline_test.cc
 | 
| @@ -24,7 +24,7 @@ class TimelineTestHelper : public AllStatic {
 | 
|      TimelineEvent* event = block->StartEvent();
 | 
|      ASSERT(event != NULL);
 | 
|      event->DurationBegin("fake");
 | 
| -    event->thread_ = static_cast<ThreadId>(ftid);
 | 
| +    event->thread_ = OSThread::ThreadIdFromIntPtr(ftid);
 | 
|      return event;
 | 
|    }
 | 
|  };
 | 
| @@ -280,10 +280,12 @@ TEST_CASE(TimelineAnalysis_ThreadBlockCount) {
 | 
|    EXPECT_EQ(2, ta.NumThreads());
 | 
|  
 | 
|    // Extract both threads.
 | 
| -  TimelineAnalysisThread* thread_1 = ta.GetThread(static_cast<ThreadId>(1));
 | 
| -  TimelineAnalysisThread* thread_2 = ta.GetThread(static_cast<ThreadId>(2));
 | 
| -  EXPECT_EQ(static_cast<ThreadId>(1), thread_1->id());
 | 
| -  EXPECT_EQ(static_cast<ThreadId>(2), thread_2->id());
 | 
| +  TimelineAnalysisThread* thread_1 =
 | 
| +      ta.GetThread(OSThread::ThreadIdFromIntPtr(1));
 | 
| +  TimelineAnalysisThread* thread_2 =
 | 
| +      ta.GetThread(OSThread::ThreadIdFromIntPtr(2));
 | 
| +  EXPECT_EQ(OSThread::ThreadIdFromIntPtr(1), thread_1->id());
 | 
| +  EXPECT_EQ(OSThread::ThreadIdFromIntPtr(2), thread_2->id());
 | 
|  
 | 
|    // Thread "1" should have three blocks.
 | 
|    EXPECT_EQ(3, thread_1->NumBlocks());
 | 
| 
 |