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

Unified Diff: content/renderer/media/mock_media_stream_dependency_factory.h

Issue 14200016: Added implementation of RemoteMediaStreams. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix nits Created 7 years, 8 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/mock_media_stream_dependency_factory.h
diff --git a/content/renderer/media/mock_media_stream_dependency_factory.h b/content/renderer/media/mock_media_stream_dependency_factory.h
index 9809fabd5bd1bbe16efa0438960e83ded9462212..94cd84ea62da4ca319dd2326844c916656d953e7 100644
--- a/content/renderer/media/mock_media_stream_dependency_factory.h
+++ b/content/renderer/media/mock_media_stream_dependency_factory.h
@@ -35,13 +35,14 @@ class MockVideoSource : public webrtc::VideoSourceInterface {
virtual ~MockVideoSource();
private:
- webrtc::ObserverInterface* observer_;
- MediaSourceInterface::SourceState state_;
+ webrtc::ObserverInterface* observer_;
+ MediaSourceInterface::SourceState state_;
};
class MockAudioSource : public webrtc::AudioSourceInterface {
public:
- MockAudioSource(const webrtc::MediaConstraintsInterface* constraints);
+ explicit MockAudioSource(
+ const webrtc::MediaConstraintsInterface* constraints);
virtual void RegisterObserver(webrtc::ObserverInterface* observer) OVERRIDE;
virtual void UnregisterObserver(webrtc::ObserverInterface* observer) OVERRIDE;
@@ -95,14 +96,18 @@ class MockLocalVideoTrack : public webrtc::VideoTrackInterface {
private:
bool enabled_;
std::string id_;
+ TrackState state_;
scoped_refptr<webrtc::VideoSourceInterface> source_;
+ webrtc::ObserverInterface* observer_;
};
class MockLocalAudioTrack : public webrtc::AudioTrackInterface {
public:
explicit MockLocalAudioTrack(const std::string& id)
: enabled_(false),
- id_(id) {
+ id_(id),
+ state_(MediaStreamTrackInterface::kLive),
+ observer_(NULL) {
}
virtual std::string kind() const OVERRIDE;
virtual std::string id() const OVERRIDE;
@@ -120,6 +125,8 @@ class MockLocalAudioTrack : public webrtc::AudioTrackInterface {
private:
bool enabled_;
std::string id_;
+ TrackState state_;
+ webrtc::ObserverInterface* observer_;
};
// A mock factory for creating different objects for

Powered by Google App Engine
This is Rietveld 408576698