Fix MacOS build

runtime/vm/timeline_test.cc

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "platform/assert.h"
 
 #include "vm/dart_api_impl.h"
 #include "vm/dart_api_state.h"
 #include "vm/globals.h"
 #include "vm/timeline.h"
 #include "vm/timeline_analysis.h"
 #include "vm/unit_test.h"
 
 namespace dart {
 
 class TimelineTestHelper : public AllStatic {
  public:
   static void SetStream(TimelineEvent* event, TimelineStream* stream) {
     event->StreamInit(stream);
   }
 
   static TimelineEvent* FakeThreadEvent(
       TimelineEventBlock* block, intptr_t ftid) {
     TimelineEvent* event = block->StartEvent();
     ASSERT(event != NULL);
     event->DurationBegin("fake");
-    event->thread_ = static_cast<ThreadId>(ftid);
+    event->thread_ = OSThread::ThreadIdFromIntPtr(ftid);
     return event;
   }
 };
 
 
 TEST_CASE(TimelineEventIsValid) {
   // Create a test stream.
   TimelineStream stream;
   stream.Init("testStream", true);
 
@@ skipping 235 matching lines @@
   Zone* zone = thread->zone();
   Isolate* isolate = thread->isolate();
 
   // Discover threads in recorder.
   TimelineAnalysis ta(zone, isolate, recorder);
   ta.BuildThreads();
   // block_3_0 is never used by a thread, so we only have two threads.
   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());
 
   // Verify that blocks for thread "1" are sorted based on start time.
   EXPECT_EQ(thread_1->At(0), block_1_2);
   EXPECT_EQ(thread_1->At(1), block_1_0);
   EXPECT_EQ(thread_1->At(2), block_1_1);
 
   // Verify that block_1_2 has three events.
   EXPECT_EQ(3, block_1_2->length());
 
   // Verify that block_1_0 has one events.
   EXPECT_EQ(1, block_1_0->length());
 
   // Verify that block_1_1 has two events.
   EXPECT_EQ(2, block_1_1->length());
 
   // Thread '2" should have one block.'
   EXPECT_EQ(1, thread_2->NumBlocks());
   EXPECT_EQ(thread_2->At(0), block_2_0);
   // Verify that block_2_0 has six events.
   EXPECT_EQ(6, block_2_0->length());
 }
 
 }  // namespace dart