Enabling usage of native PeerConnection v2 in libjingle.

content/renderer/media/mock_peer_connection_impl.h

Index: content/renderer/media/mock_peer_connection_impl.h
diff --git a/content/renderer/media/mock_peer_connection_impl.h b/content/renderer/media/mock_peer_connection_impl.h
index 4d743555fb401a32fff36762f9679cf666f41fe3..44820151e53ebe713a2fc9a0bdc61306cc204f7a 100644
--- a/content/renderer/media/mock_peer_connection_impl.h
+++ b/content/renderer/media/mock_peer_connection_impl.h
@@ -9,50 +9,39 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "third_party/libjingle/source/talk/app/webrtcv1/peerconnection.h"
+#include "third_party/libjingle/source/talk/app/webrtc/peerconnection.h"
 
 namespace webrtc {
 
-class MockPeerConnectionImpl : public PeerConnection {
+class MockPeerConnectionImpl : public PeerConnectionInterface {
  public:
   MockPeerConnectionImpl();
-  virtual ~MockPeerConnectionImpl();
-
-  // PeerConnection implementation.
-  virtual void RegisterObserver(PeerConnectionObserver* observer) OVERRIDE;
-  virtual bool SignalingMessage(const std::string& msg) OVERRIDE;
-  virtual bool AddStream(const std::string& stream_id, bool video) OVERRIDE;
-  virtual bool RemoveStream(const std::string& stream_id) OVERRIDE;
-  virtual bool Connect() OVERRIDE;
-  virtual bool Close() OVERRIDE;
-  virtual bool SetAudioDevice(
-      const std::string& wave_in_device,
-      const std::string& wave_out_device, int opts) OVERRIDE;
-  virtual bool SetLocalVideoRenderer(cricket::VideoRenderer* renderer) OVERRIDE;
-  virtual bool SetVideoRenderer(
-      const std::string& stream_id,
-      cricket::VideoRenderer* renderer) OVERRIDE;
-  virtual bool SetVideoCapture(const std::string& cam_device) OVERRIDE;
-  virtual ReadyState GetReadyState() OVERRIDE;
-
-  PeerConnectionObserver* observer() const { return observer_; }
+
+  // PeerConnectionInterface implementation.
+  virtual void ProcessSignalingMessage(const std::string& msg) OVERRIDE;
+  virtual bool Send(const std::string& msg) OVERRIDE;
+  virtual talk_base::scoped_refptr<StreamCollectionInterface>
+      local_streams() OVERRIDE;
+  virtual talk_base::scoped_refptr<StreamCollectionInterface>
+      remote_streams() OVERRIDE;
+  virtual void AddStream(LocalMediaStreamInterface* stream) OVERRIDE;
+  virtual void RemoveStream(LocalMediaStreamInterface* stream) OVERRIDE;
+  virtual void CommitStreamChanges() OVERRIDE;
+  virtual void Close() OVERRIDE;
+  virtual ReadyState ready_state() OVERRIDE;
+  virtual SdpState sdp_state() OVERRIDE;
+
   const std::string& signaling_message() const { return signaling_message_; }
-  const std::string& stream_id() const { return stream_id_; }
-  bool video_stream() const { return video_stream_; }
-  bool connected() const { return connected_; }
-  bool video_capture_set() const { return video_capture_set_; }
-  const std::string& video_renderer_stream_id() const {
-    return video_renderer_stream_id_;
-  }
+  const std::string& stream_label() const { return stream_label_; }
+  bool stream_changes_committed() const { return stream_changes_committed_; }
+
+ protected:
+  ~MockPeerConnectionImpl();
 
  private:
-  PeerConnectionObserver* observer_;
   std::string signaling_message_;
-  std::string stream_id_;
-  bool video_stream_;
-  bool connected_;
-  bool video_capture_set_;
-  std::string video_renderer_stream_id_;
+  std::string stream_label_;
+  bool stream_changes_committed_;
 
   DISALLOW_COPY_AND_ASSIGN(MockPeerConnectionImpl);
 };