Call event_assign() instead of event_set(), when available.

webrtc/base/task_queue_libevent.cc

 /*
  *  Copyright 2016 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 106 matching lines @@
     : event_base_(event_base_new()),
       wakeup_event_(new event()),
       thread_(&TaskQueue::ThreadMain, this, queue_name) {
   RTC_DCHECK(queue_name);
   int fds[2];
   RTC_CHECK(pipe(fds) == 0);
   SetNonBlocking(fds[0]);
   SetNonBlocking(fds[1]);
   wakeup_pipe_out_ = fds[0];
   wakeup_pipe_in_ = fds[1];
+  // TODO(tommi): This is a hack to support two versions of libevent that we're
+  // compatible with.  The method we really want to call is event_assign(),
+  // since event_set() has been marked as deprecated (and doesn't accept
+  // passing event_base__ as a parameter).  However, the version of libevent
+  // that we have in Chromium, doesn't have event_assign(), so we need to call
+  // event_set() there.
+#if defined(_EVENT2_EVENT_H_)
+  event_assign(wakeup_event_.get(), event_base_, wakeup_pipe_out_,
+               EV_READ | EV_PERSIST, OnWakeup, this);
+#else
   event_set(wakeup_event_.get(), wakeup_pipe_out_, EV_READ | EV_PERSIST,
             OnWakeup, this);
+#endif
   event_base_set(event_base_, wakeup_event_.get());
   event_add(wakeup_event_.get(), 0);
   thread_.Start();
 }
 
 TaskQueue::~TaskQueue() {
   RTC_DCHECK(!IsCurrent());
   struct timespec ts;
   char message = kQuit;
   while (write(wakeup_pipe_in_, &message, sizeof(message)) != sizeof(message)) {
@@ skipping 170 matching lines @@
   CritScope lock(&pending_lock_);
   pending_replies_.push_back(reply_task);
 }
 
 void TaskQueue::ReplyTaskDone(PostAndReplyTask* reply_task) {
   CritScope lock(&pending_lock_);
   pending_replies_.remove(reply_task);
 }
 
 }  // namespace rtc