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

Side by Side Diff: content/renderer/media/mock_media_stream_dependency_factory.cc

Issue 10804004: Remove the deprecated PeerConnection that uses the ROAP protocol. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed trailing whitespace in webrtc.py Created 8 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/logging.h" 5 #include "base/logging.h"
6 #include "content/renderer/media/mock_media_stream_dependency_factory.h" 6 #include "content/renderer/media/mock_media_stream_dependency_factory.h"
7 #include "content/renderer/media/mock_peer_connection_impl.h" 7 #include "content/renderer/media/mock_peer_connection_impl.h"
8 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h" 8 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
9 #include "third_party/libjingle/source/talk/base/scoped_ref_ptr.h" 9 #include "third_party/libjingle/source/talk/base/scoped_ref_ptr.h"
10 10
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 } 273 }
274 274
275 talk_base::scoped_refptr<webrtc::PeerConnectionInterface> 275 talk_base::scoped_refptr<webrtc::PeerConnectionInterface>
276 MockMediaStreamDependencyFactory::CreatePeerConnection( 276 MockMediaStreamDependencyFactory::CreatePeerConnection(
277 const std::string& config, 277 const std::string& config,
278 webrtc::PeerConnectionObserver* observer) { 278 webrtc::PeerConnectionObserver* observer) {
279 DCHECK(mock_pc_factory_created_); 279 DCHECK(mock_pc_factory_created_);
280 return new talk_base::RefCountedObject<webrtc::MockPeerConnectionImpl>(this); 280 return new talk_base::RefCountedObject<webrtc::MockPeerConnectionImpl>(this);
281 } 281 }
282 282
283 talk_base::scoped_refptr<webrtc::PeerConnectionInterface>
284 MockMediaStreamDependencyFactory::CreateRoapPeerConnection(
285 const std::string& config,
286 webrtc::PeerConnectionObserver* observer) {
287 DCHECK(mock_pc_factory_created_);
288 return new talk_base::RefCountedObject<webrtc::MockPeerConnectionImpl>(this);
289 }
290
291 talk_base::scoped_refptr<webrtc::LocalMediaStreamInterface> 283 talk_base::scoped_refptr<webrtc::LocalMediaStreamInterface>
292 MockMediaStreamDependencyFactory::CreateLocalMediaStream( 284 MockMediaStreamDependencyFactory::CreateLocalMediaStream(
293 const std::string& label) { 285 const std::string& label) {
294 talk_base::scoped_refptr<webrtc::LocalMediaStreamInterface> stream( 286 talk_base::scoped_refptr<webrtc::LocalMediaStreamInterface> stream(
295 new talk_base::RefCountedObject<webrtc::MockLocalMediaStream>(label)); 287 new talk_base::RefCountedObject<webrtc::MockLocalMediaStream>(label));
296 return stream; 288 return stream;
297 } 289 }
298 290
299 talk_base::scoped_refptr<webrtc::LocalVideoTrackInterface> 291 talk_base::scoped_refptr<webrtc::LocalVideoTrackInterface>
300 MockMediaStreamDependencyFactory::CreateLocalVideoTrack( 292 MockMediaStreamDependencyFactory::CreateLocalVideoTrack(
(...skipping 18 matching lines...) Expand all
319 const std::string& sdp) { 311 const std::string& sdp) {
320 return new webrtc::MockSessionDescription(sdp); 312 return new webrtc::MockSessionDescription(sdp);
321 } 313 }
322 314
323 webrtc::IceCandidateInterface* 315 webrtc::IceCandidateInterface*
324 MockMediaStreamDependencyFactory::CreateIceCandidate( 316 MockMediaStreamDependencyFactory::CreateIceCandidate(
325 const std::string& label, 317 const std::string& label,
326 const std::string& sdp) { 318 const std::string& sdp) {
327 return new webrtc::MockIceCandidate(label, sdp); 319 return new webrtc::MockIceCandidate(label, sdp);
328 } 320 }
OLDNEW
« no previous file with comments | « content/renderer/media/mock_media_stream_dependency_factory.h ('k') | content/renderer/media/peer_connection_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698