Fix race condition in EventTimerPosix

webrtc/system_wrappers/source/event_timer_posix.h

Index: webrtc/system_wrappers/source/event_timer_posix.h
diff --git a/webrtc/system_wrappers/source/event_timer_posix.h b/webrtc/system_wrappers/source/event_timer_posix.h
index bbf51f72db7b36c10ad412fa7f630f8ecec62d0b..9ca8ba25dedf2229e9c4b0fa9d959bb0bb56562d 100644
--- a/webrtc/system_wrappers/source/event_timer_posix.h
+++ b/webrtc/system_wrappers/source/event_timer_posix.h
@@ -39,9 +39,10 @@ class EventTimerPosix : public EventTimerWrapper {
  private:
   static bool Run(void* obj);
   bool Process();
-  EventTypeWrapper Wait(timespec* end_at);
+  EventTypeWrapper Wait(timespec* end_at, bool reset_state);
+
+  virtual rtc::PlatformThread* CreateThread();
 
- private:
   pthread_cond_t  cond_;
   pthread_mutex_t mutex_;
   bool event_set_;
@@ -52,8 +53,11 @@ class EventTimerPosix : public EventTimerWrapper {
   timespec       created_at_;
 
   bool          periodic_;
-  unsigned long time_;  // In ms
+  unsigned long time_ms_;
   unsigned long count_;
+  bool is_stopping_;
+
+  friend class EventTimerPosixTest;

[mflodman, 2016/03/18 09:19:23]

This is normally put directly on the line after 'private:'.

[sprang_webrtc, 2016/03/18 09:24:28]

Done.

 };
 
 }  // namespace webrtc