Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(399)

Unified Diff: content/renderer/media/rtc_peer_connection_handler.cc

Issue 1373023002: RTCCertificate, RTCPeerConnection.generateCertificate (WebRTC JavaScript) added. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed nits + Pass webkit_tests (updated global-interface-listing-expected.txt) Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/rtc_peer_connection_handler.cc
diff --git a/content/renderer/media/rtc_peer_connection_handler.cc b/content/renderer/media/rtc_peer_connection_handler.cc
index e8a1e15243b23d3d397529c0960c26f5dace9d87..86ea7c37c5757534c9b1551652878177a4aa0162 100644
--- a/content/renderer/media/rtc_peer_connection_handler.cc
+++ b/content/renderer/media/rtc_peer_connection_handler.cc
@@ -12,7 +12,6 @@
#include "base/lazy_instance.h"
#include "base/location.h"
#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
#include "base/metrics/histogram.h"
#include "base/metrics/sparse_histogram.h"
#include "base/stl_util.h"
@@ -23,6 +22,7 @@
#include "content/renderer/media/media_stream_track.h"
#include "content/renderer/media/peer_connection_tracker.h"
#include "content/renderer/media/remote_media_stream_impl.h"
+#include "content/renderer/media/rtc_certificate.h"
#include "content/renderer/media/rtc_data_channel_handler.h"
#include "content/renderer/media/rtc_dtmf_sender_handler.h"
#include "content/renderer/media/rtc_media_constraints.h"
@@ -256,6 +256,11 @@ void GetNativeRtcConfiguration(
default:
NOTREACHED();
}
+
+ for (size_t i = 0; i < blink_config.numberOfCertificates(); ++i) {
jochen (gone - plz use gerrit) 2015/10/20 12:27:35 use a range for loop
hbos_chromium 2015/10/20 15:42:23 The certificates of WebRTCConfiguration is not a c
+ webrtc_config->certificates.push_back(
+ blink_config.certificate(i)->rtcCertificate());
+ }
}
class SessionDescriptionRequestTracker {

Powered by Google App Engine
This is Rietveld 408576698