diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
index e29fb11193..5e7226be4b 100644
--- a/webrtc/BUILD.gn
+++ b/webrtc/BUILD.gn
@@ -427,8 +427,7 @@ if (rtc_include_tests) {
       "base/sharedexclusivelock_unittest.cc",
       "base/signalthread_unittest.cc",
       "base/sigslot_unittest.cc",
-      "base/sigslottester.h",
-      "base/sigslottester.h.pump",
+      "base/sigslottester_unittest.cc",
       "base/stream_unittest.cc",
       "base/stringencode_unittest.cc",
       "base/stringutils_unittest.cc",
diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn
index 69ba7725fd..2dea2583a8 100644
--- a/webrtc/base/BUILD.gn
+++ b/webrtc/base/BUILD.gn
@@ -739,6 +739,8 @@ if (rtc_include_tests) {
       "firewallsocketserver.cc",
       "firewallsocketserver.h",
       "gunit.h",
+      "sigslottester.h",
+      "sigslottester.h.pump",
       "testbase64.h",
       "testechoserver.h",
       "testutils.h",
diff --git a/webrtc/base/sigslottester.h b/webrtc/base/sigslottester.h
index ffd829427a..18ddde30cb 100755
--- a/webrtc/base/sigslottester.h
+++ b/webrtc/base/sigslottester.h
@@ -57,7 +57,7 @@ class SigslotTester0 : public sigslot::has_slots<> {
   void OnSignalCallback() { callback_count_++; }
   int callback_count_;
 
-  DISALLOW_COPY_AND_ASSIGN(SigslotTester0);
+  RTC_DISALLOW_COPY_AND_ASSIGN(SigslotTester0);
 };
 
 // Versions below are for testing signals that pass arguments. For all the
diff --git a/webrtc/base/sigslottester.h.pump b/webrtc/base/sigslottester.h.pump
index 27cd6541cc..8be9d7c31d 100755
--- a/webrtc/base/sigslottester.h.pump
+++ b/webrtc/base/sigslottester.h.pump
@@ -53,7 +53,7 @@ class SigslotTester0 : public sigslot::has_slots<> {
   void OnSignalCallback() { callback_count_++; }
   int callback_count_;
 
-  DISALLOW_COPY_AND_ASSIGN(SigslotTester0);
+  RTC_DISALLOW_COPY_AND_ASSIGN(SigslotTester0);
 };
 
 // Versions below are for testing signals that pass arguments. For all the