| Index: webrtc/p2p/BUILD.gn | 
| diff --git a/webrtc/p2p/BUILD.gn b/webrtc/p2p/BUILD.gn | 
| index 07fcdf44f83f0a4d317e4bd2c5b838a60adc36bd..6f65bba6eafe1cad7f1e2d9e33d4197d0e0bd072 100644 | 
| --- a/webrtc/p2p/BUILD.gn | 
| +++ b/webrtc/p2p/BUILD.gn | 
| @@ -83,7 +83,10 @@ rtc_static_library("rtc_p2p") { | 
| defines = [] | 
|  | 
| deps = [ | 
| +    "../api:libjingle_peerconnection_api", | 
| +    "../api:ortc_api", | 
| "../base:rtc_base", | 
| +    "../system_wrappers", | 
| ] | 
|  | 
| if (rtc_build_expat) { | 
| @@ -145,13 +148,7 @@ if (rtc_include_tests) { | 
| 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/port_unittest.cc", | 
| "base/portallocator_unittest.cc", | 
| @@ -163,9 +160,6 @@ if (rtc_include_tests) { | 
| "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", | 
| @@ -184,7 +178,13 @@ if (rtc_include_tests) { | 
| } | 
| deps = [ | 
| ":rtc_p2p", | 
| +      ":rtc_p2p_test_utils", | 
| "../api:fakemetricsobserver", | 
| +      "../api:ortc_api", | 
| +      "../base:rtc_base", | 
| +      "../base:rtc_base_approved", | 
| +      "../base:rtc_base_tests_utils", | 
| +      "../test:test_support", | 
| "//testing/gmock", | 
| "//testing/gtest", | 
| ] | 
| @@ -194,6 +194,30 @@ if (rtc_include_tests) { | 
| } | 
| defines = [ "GTEST_RELATIVE_PATH" ] | 
| } | 
| + | 
| +  rtc_source_set("rtc_p2p_test_utils") { | 
| +    testonly = true | 
| +    sources = [ | 
| +      "base/fakecandidatepair.h", | 
| +      "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", | 
| +      "../api:ortc_api", | 
| +      "../base:rtc_base", | 
| +      "../base:rtc_base_approved", | 
| +      "../base:rtc_base_tests_utils", | 
| +      "../test:test_support", | 
| +    ] | 
| +  } | 
| } | 
|  | 
| rtc_static_library("libstunprober") { | 
| @@ -208,6 +232,7 @@ rtc_static_library("libstunprober") { | 
| } | 
|  | 
| deps = [ | 
| +    ":rtc_p2p", | 
| "..:webrtc_common", | 
| "../base:rtc_base", | 
| ] | 
| @@ -221,6 +246,10 @@ if (rtc_include_tests) { | 
| ] | 
| deps = [ | 
| ":libstunprober", | 
| +      ":rtc_p2p", | 
| +      ":rtc_p2p_test_utils", | 
| +      "../base:rtc_base", | 
| +      "../base:rtc_base_tests_utils", | 
| "//testing/gmock", | 
| "//testing/gtest", | 
| ] | 
|  |