commit 15c9cf732bfe67006249f89c72bb06c4632c6159
author Niels Möller <nisse@webrtc.org> Thu Oct 19 12:38:09 2017 +0200
committer Commit Bot <commit-bot@chromium.org> Thu Oct 19 12:15:22 2017 +0000
tree 70c7f7aa0054c037b39c46148b8e1d38384918cb
parent 1c66f9fcd1cb74b375248212ebded8d679935cd9

Reland "Delete reference to webrtc_overides/rtc_base/task_queue.cc."

This is a reland of 17a0474379ebba7f48a59f2952b0a184071c47d8
Original change's description:
> Delete reference to webrtc_overides/rtc_base/task_queue.cc.
> 
> This change depends on Chromium cl
> https://chromium-review.googlesource.com/c/chromium/src/+/681814,
> which must be landed first.
> 
> Bug: webrtc:8166
> Change-Id: I8e1c96ad5927e1d9d4e45e6f6c0b5f712d58cef7
> Reviewed-on: https://webrtc-review.googlesource.com/3940
> Reviewed-by: Henrik Kjellander <kjellander@webrtc.org>
> Reviewed-by: Per Kjellander <perkj@webrtc.org>
> Commit-Queue: Niels Moller <nisse@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#20071}

Bug: webrtc:8166
Change-Id: Ia011f82dde96e8f0c5c18ad7ac20fd6b7adcb1e8
Reviewed-on: https://webrtc-review.googlesource.com/13620
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Henrik Kjellander <kjellander@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20352}

rtc_base/BUILD.gn

diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index 65b16e5..443d32e 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -349,32 +349,27 @@
     ":rtc_base_approved",
     ":rtc_task_queue_api",
   ]
-  if (build_with_chromium) {
+  if (rtc_build_libevent) {
+    deps += [ "//base/third_party/libevent" ]
+  }
+  if (rtc_enable_libevent) {
     sources = [
-      "../../webrtc_overrides/rtc_base/task_queue.cc",
+      "task_queue_libevent.cc",
+      "task_queue_posix.cc",
+      "task_queue_posix.h",
     ]
   } else {
-    if (rtc_build_libevent) {
-      deps += [ "//base/third_party/libevent" ]
-    }
-    if (rtc_enable_libevent) {
+    if (is_mac || is_ios) {
       sources = [
-        "task_queue_libevent.cc",
+        "task_queue_gcd.cc",
         "task_queue_posix.cc",
         "task_queue_posix.h",
       ]
-    } else {
-      if (is_mac || is_ios) {
-        sources = [
-          "task_queue_gcd.cc",
-          "task_queue_posix.cc",
-        ]
-      }
-      if (is_win) {
-        sources = [
-          "task_queue_win.cc",
-        ]
-      }
+    }
+    if (is_win) {
+      sources = [
+        "task_queue_win.cc",
+      ]
     }
   }
 }