Revert https://code.google.com/p/dart/source/detail?r=597

vm/thread.h

 // Copyright (c) 2011, 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.
 
-#ifndef RUNTIME_VM_THREAD_H_
-#define RUNTIME_VM_THREAD_H_
+#ifndef VM_THREAD_H_
+#define VM_THREAD_H_
 
 #include "vm/assert.h"
 #include "vm/allocation.h"
 #include "vm/globals.h"
 
 // Declare the OS-specific types ahead of defining the generic classes.
 #if defined(TARGET_OS_LINUX)
 #include "vm/thread_linux.h"
 #elif defined(TARGET_OS_MACOS)
 #include "vm/thread_macos.h"
@@ skipping 46 matching lines @@
 
   static const int64_t kNoTimeout = 0;
 
   Monitor();
   ~Monitor();
 
   void Enter();
   void Exit();
 
   // Wait for notification or timeout.
-  // May return too early due to spurious wakeups. Callers should test for this.
   WaitResult Wait(int64_t millis);
 
   // Notify waiting threads.
   void Notify();
   void NotifyAll();
 
  private:
   MonitorData data_;  // OS-specific data.
 
   DISALLOW_COPY_AND_ASSIGN(Monitor);
@@ skipping 28 matching lines @@
     ASSERT(monitor != NULL);
     // TODO(iposva): Consider adding a no GC scope here.
     monitor_->Enter();
   }
 
   virtual ~MonitorLocker() {
     monitor_->Exit();
     // TODO(iposva): Consider decrementing the no GC scope here.
   }
 
-  // May return too early due to spurious wakeups. Callers should test for this.
   Monitor::WaitResult Wait(int64_t millis = Monitor::kNoTimeout) {
     return monitor_->Wait(millis);
   }
 
   void Notify() {
     monitor_->Notify();
   }
 
   void NotifyAll() {
     monitor_->NotifyAll();
   }
 
  private:
   Monitor* const monitor_;
 
   DISALLOW_COPY_AND_ASSIGN(MonitorLocker);
 };
 
 }  // namespace dart
 
 
-#endif  // RUNTIME_VM_THREAD_H_
+#endif  // VM_THREAD_H_