Relanding: Remove rtc_p2p_unittests from ortc_unittests and rtc_media_unittests

webrtc/p2p/BUILD.gn

 # Copyright (c) 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.
 
 import("../webrtc.gni")
 
@@ skipping 124 matching lines @@
       "quic/quictransportchannel.cc",
       "quic/quictransportchannel.h",
       "quic/reliablequicstream.cc",
       "quic/reliablequicstream.h",
     ]
     public_deps += [ "//third_party/libquic" ]
   }
 }
 
 if (rtc_include_tests) {
+  rtc_source_set("p2p_test_utils") {
+    testonly = true
+    sources = [
+      "base/fakedtlstransport.h",
+      "base/fakeicetransport.h",
+      "base/fakepackettransport.h",
+      "base/fakeportallocator.h",
+      "base/faketransportcontroller.h",
+      "base/mockicetransport.h",
+      "base/testrelayserver.h",
+      "base/teststunserver.h",
+      "base/testturnserver.h",
+    ]
+
+    deps = [
+      ":rtc_p2p",
+      "//testing/gmock",
+    ]
+
+    if (!build_with_chromium && is_clang) {
+      # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
+      suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
+    }
+  }
+
   rtc_source_set("rtc_p2p_unittests") {
     testonly = true
     sources = [
       "base/asyncstuntcpsocket_unittest.cc",
       "base/dtlstransportchannel_unittest.cc",
-      "base/fakedtlstransport.h",
-      "base/fakeicetransport.h",
-      "base/fakepackettransport.h",
-      "base/fakeportallocator.h",
-      "base/faketransportcontroller.h",
       "base/jseptransport_unittest.cc",
-      "base/mockicetransport.h",
       "base/p2ptransportchannel_unittest.cc",
       "base/packetlossestimator_unittest.cc",
       "base/port_unittest.cc",
       "base/portallocator_unittest.cc",
       "base/pseudotcp_unittest.cc",
       "base/relayport_unittest.cc",
       "base/relayserver_unittest.cc",
       "base/stun_unittest.cc",
       "base/stunport_unittest.cc",
       "base/stunrequest_unittest.cc",
       "base/stunserver_unittest.cc",
       "base/tcpport_unittest.cc",
-      "base/testrelayserver.h",
-      "base/teststunserver.h",
-      "base/testturnserver.h",
       "base/transportcontroller_unittest.cc",
       "base/transportdescriptionfactory_unittest.cc",
       "base/turnport_unittest.cc",
       "base/turnserver_unittest.cc",
       "base/udptransport_unittest.cc",
       "client/basicportallocator_unittest.cc",
     ]
     if (rtc_use_quic) {
       sources += [
         "quic/quicconnectionhelper_unittest.cc",
         "quic/quicsession_unittest.cc",
         "quic/quictransport_unittest.cc",
         "quic/quictransportchannel_unittest.cc",
         "quic/reliablequicstream_unittest.cc",
       ]
     }
     deps = [
+      ":p2p_test_utils",
       ":rtc_p2p",
       "../api:fakemetricsobserver",
       "//testing/gmock",
       "//testing/gtest",
     ]
     if (!build_with_chromium && is_clang) {
       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
     }
     defines = [ "GTEST_RELATIVE_PATH" ]
@@ skipping 28 matching lines @@
       "//testing/gmock",
       "//testing/gtest",
     ]
     if (!build_with_chromium && is_clang) {
       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
     }
     defines = [ "GTEST_RELATIVE_PATH" ]
   }
 }