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

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

Issue 9284020: Enabling usage of native PeerConnection v2 in libjingle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 11 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_impl.h
diff --git a/content/renderer/media/mock_media_stream_impl.h b/content/renderer/media/mock_media_stream_impl.h
index b297b4992149db18bf3ad3b221141293069893ef..8340b9e93dc32852db3f32f205d668d675c43fde 100644
--- a/content/renderer/media/mock_media_stream_impl.h
+++ b/content/renderer/media/mock_media_stream_impl.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_RENDERER_MEDIA_MOCK_MEDIA_STREAM_IMPL_H_
#define CONTENT_RENDERER_MEDIA_MOCK_MEDIA_STREAM_IMPL_H_
+#include <map>
#include <string>
#include "content/renderer/media/media_stream_impl.h"
@@ -17,8 +18,8 @@ class MockMediaStreamImpl : public MediaStreamImpl {
virtual WebKit::WebPeerConnectionHandler* CreatePeerConnectionHandler(
WebKit::WebPeerConnectionHandlerClient* client) OVERRIDE;
virtual void ClosePeerConnection() OVERRIDE;
- // Returns true if created successfully or already exists, false otherwise.
- virtual bool SetVideoCaptureModule(const std::string& label) OVERRIDE;
+ virtual webrtc::MediaStreamTrackInterface* GetLocalMediaStreamTrack(
+ const std::string& label) OVERRIDE;
// Implement webkit_glue::MediaStreamClient.
virtual scoped_refptr<media::VideoDecoder> GetVideoDecoder(
@@ -39,10 +40,14 @@ class MockMediaStreamImpl : public MediaStreamImpl {
const std::string& label,
int index) OVERRIDE;
- const std::string& video_label() const { return video_label_; }
+ void AddTrack(
+ const std::string& label,
+ webrtc::MediaStreamTrackInterface* track);
private:
- std::string video_label_;
+ typedef std::map<std::string, webrtc::MediaStreamTrackInterface*>
+ MockMediaStreamTrackPtrMap;
+ MockMediaStreamTrackPtrMap mock_local_tracks_;
DISALLOW_COPY_AND_ASSIGN(MockMediaStreamImpl);
};
« no previous file with comments | « content/renderer/media/mock_media_stream_dependency_factory.cc ('k') | content/renderer/media/mock_media_stream_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698