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

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

Issue 16294003: Update content/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 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 "content/renderer/media/mock_media_stream_dependency_factory.h" 5 #include "content/renderer/media/mock_media_stream_dependency_factory.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "content/renderer/media/mock_peer_connection_impl.h" 9 #include "content/renderer/media/mock_peer_connection_impl.h"
10 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h" 10 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 void MockLocalVideoTrack::RegisterObserver(ObserverInterface* observer) { 266 void MockLocalVideoTrack::RegisterObserver(ObserverInterface* observer) {
267 observer_ = observer; 267 observer_ = observer;
268 } 268 }
269 269
270 void MockLocalVideoTrack::UnregisterObserver(ObserverInterface* observer) { 270 void MockLocalVideoTrack::UnregisterObserver(ObserverInterface* observer) {
271 DCHECK(observer_ == observer); 271 DCHECK(observer_ == observer);
272 observer_ = NULL; 272 observer_ = NULL;
273 } 273 }
274 274
275 VideoSourceInterface* MockLocalVideoTrack::GetSource() const { 275 VideoSourceInterface* MockLocalVideoTrack::GetSource() const {
276 return source_; 276 return source_.get();
277 } 277 }
278 278
279 std::string MockLocalAudioTrack::kind() const { 279 std::string MockLocalAudioTrack::kind() const {
280 NOTIMPLEMENTED(); 280 NOTIMPLEMENTED();
281 return std::string(); 281 return std::string();
282 } 282 }
283 283
284 std::string MockLocalAudioTrack::id() const { return id_; } 284 std::string MockLocalAudioTrack::id() const { return id_; }
285 285
286 bool MockLocalAudioTrack::enabled() const { return enabled_; } 286 bool MockLocalAudioTrack::enabled() const { return enabled_; }
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
505 505
506 webrtc::IceCandidateInterface* 506 webrtc::IceCandidateInterface*
507 MockMediaStreamDependencyFactory::CreateIceCandidate( 507 MockMediaStreamDependencyFactory::CreateIceCandidate(
508 const std::string& sdp_mid, 508 const std::string& sdp_mid,
509 int sdp_mline_index, 509 int sdp_mline_index,
510 const std::string& sdp) { 510 const std::string& sdp) {
511 return new MockIceCandidate(sdp_mid, sdp_mline_index, sdp); 511 return new MockIceCandidate(sdp_mid, sdp_mline_index, sdp);
512 } 512 }
513 513
514 } // namespace content 514 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/mock_media_stream_dependency_factory.h ('k') | content/renderer/media/mock_media_stream_registry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698