roll up of misc. gn work

content/test/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/module_args/v8.gni")
 import("//testing/test.gni")
 import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
@@ skipping 63 matching lines @@
       "//ui/surface",
       "//v8",
       "//webkit/common/gpu",
     ]
 
     if (enable_plugins) {
       deps += [ "//content/ppapi_plugin" ]
     }
 
     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",
         "../renderer/media/mock_web_rtc_peer_connection_handler_client.h",
         "../renderer/media/webrtc/mock_peer_connection_dependency_factory.cc",
         "../renderer/media/webrtc/mock_peer_connection_dependency_factory.h",
       ]
 
       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",
       ]
     }
     if (!enable_plugins) {
       sources -= [ "ppapi_unittest.cc" ]
     }
 
     if (use_glib) {
       configs += [ "//build/config/linux:glib" ]
     }
@@ skipping 583 matching lines @@
       "//content/public/common",
       "//testing/gtest",
       "//third_party/WebKit/public:blink",
       "//ui/base",
       "//ui/gfx",
       "//ui/gfx/geometry",
       "//ui/gl",
     ]
   }
 }