roll up of misc. gn work

content/test/BUILD.gn

Index: content/test/BUILD.gn
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index 1512477bc0362dd7e3c0048c1f7331598d8a3d43..74ea107cd4b79ab1d9ab487dbb070611cbc1b58a 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -81,12 +81,11 @@ static_library("test_support") {
     }
 
     if (enable_webrtc) {
-      # TODO(GYP) remove this when libjingle is converted.
-      configs += [ "//third_party/libjingle:jingle_direct_dependent_configs" ]
-
       sources += [
         "../renderer/media/mock_media_stream_dispatcher.cc",
         "../renderer/media/mock_media_stream_dispatcher.h",
+        "../renderer/media/mock_data_channel_impl.cc",
+        "../renderer/media/mock_data_channel_impl.h",
         "../renderer/media/mock_peer_connection_impl.cc",
         "../renderer/media/mock_peer_connection_impl.h",
         "../renderer/media/mock_web_rtc_peer_connection_handler_client.cc",
@@ -96,8 +95,8 @@ static_library("test_support") {
       ]
 
       deps += [
-        #"//third_party/libjingle:webrtc",  TODO(GYP)
-        #"//third_party/libjingle:peerconnection",  TODO(GYP)
+        "//third_party/libjingle:libjingle_webrtc",
+        "//third_party/libjingle:libpeerconnection",
         "//third_party/webrtc/modules/video_capture",
       ]
     }