Enabling usage of native PeerConnection v2 in libjingle.

content/renderer/media/mock_media_stream_impl.h

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..f7378dd1976dc5bbce9ccbc6beeceff79f9bbe03 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(
+      std::string label) OVERRIDE;

[tommi (sloooow) - chröme, 2012/01/24 15:18:56]

change the interface to pass |label| by ref

[Henrik Grunell, 2012/01/26 13:03:16]

Done.

 
   // Implement webkit_glue::MediaStreamClient.
   virtual scoped_refptr<media::VideoDecoder> GetVideoDecoder(
@@ -39,10 +40,15 @@ class MockMediaStreamImpl : public MediaStreamImpl {
       const std::string& label,
       int index) OVERRIDE;
 
-  const std::string& video_label() const { return video_label_; }
+  void AddTrack(std::string label, webrtc::MediaStreamTrackInterface* track);

[tommi (sloooow) - chröme, 2012/01/24 15:18:56]

label should be passed by ref

[Henrik Grunell, 2012/01/26 13:03:16]

Done.

+
+  const std::string& get_track_label() const { return get_track_label_; }
 
  private:
-  std::string video_label_;
+  std::string get_track_label_;

[tommi (sloooow) - chröme, 2012/01/24 15:18:56]

get_track_label_ feels like a method name, not variable name.
suggest change to track_label_.

[Henrik Grunell, 2012/01/26 13:03:16]

Not used anymore, removed.

+  typedef std::map<std::string, webrtc::MediaStreamTrackInterface*>
+      MockMediaStreamTrackPtrMap;
+  MockMediaStreamTrackPtrMap mock_local_tracks_;
 
   DISALLOW_COPY_AND_ASSIGN(MockMediaStreamImpl);
 };