| Index: content/renderer/media/media_stream_impl.cc
|
| diff --git a/content/renderer/media/media_stream_impl.cc b/content/renderer/media/media_stream_impl.cc
|
| index b68d34d2a4ecc375730cbc1efdef9117d22b74c4..6752985aa3f5fcee1fa3e4a0e10b88e7d9a47ae8 100644
|
| --- a/content/renderer/media/media_stream_impl.cc
|
| +++ b/content/renderer/media/media_stream_impl.cc
|
| @@ -19,6 +19,7 @@
|
| #include "content/renderer/media/media_stream_dependency_factory.h"
|
| #include "content/renderer/media/media_stream_dispatcher.h"
|
| #include "content/renderer/media/peer_connection_handler_jsep.h"
|
| +#include "content/renderer/media/rtc_peer_connection_handler.h"
|
| #include "content/renderer/media/video_capture_impl_manager.h"
|
| #include "content/renderer/media/video_capture_module_impl.h"
|
| #include "content/renderer/media/webrtc_audio_device_impl.h"
|
| @@ -43,6 +44,7 @@ const int kVideoCaptureFramePerSecond = 30;
|
| enum JavaScriptAPIName {
|
| kWebkitGetUserMedia,
|
| kWebkitPeerConnection,
|
| + kWebkitRtcPeerConnection,
|
| kInvalidName
|
| };
|
| } // namespace
|
| @@ -110,6 +112,23 @@ MediaStreamImpl::CreatePeerConnectionHandlerJsep(
|
| return pc_handler;
|
| }
|
|
|
| +WebKit::WebRTCPeerConnectionHandler*
|
| +MediaStreamImpl::CreateRTCPeerConnectionHandler(
|
| + WebKit::WebRTCPeerConnectionHandlerClient* client) {
|
| + // Save histogram data so we can see how much PeerConnetion is used.
|
| + // The histogram counts the number of calls to the JS API
|
| + // webKitRTCPeerConnection.
|
| + UpdateWebRTCMethodCount(kWebkitRtcPeerConnection);
|
| + DCHECK(CalledOnValidThread());
|
| + if (!EnsurePeerConnectionFactory())
|
| + return NULL;
|
| +
|
| + RTCPeerConnectionHandler* pc_handler = new RTCPeerConnectionHandler(
|
| + client,
|
| + dependency_factory_.get());
|
| + return pc_handler;
|
| +}
|
| +
|
| void MediaStreamImpl::StopLocalMediaStream(
|
| const WebKit::WebMediaStreamDescriptor& stream) {
|
| DVLOG(1) << "MediaStreamImpl::StopLocalMediaStream";
|
|
|