commit 1a6c6281ca028e4fbba5c015ed7166ffc34bae9c
author jiayl@webrtc.org <jiayl@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Jun 12 21:59:29 2014
committer jiayl@webrtc.org <jiayl@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Jun 12 21:59:29 2014
tree a3eca834b445ad33570c3b699aaec835d7591302
parent 3c13ed3b93f407c0bc2fe6567aff221b60071d68

Revert r6420 'Revert r6390 "Adds end to end DataChannel tests." Flaky on linux_memcheck'
Failing tests are disabled for memcheck.

TBR=wu@webrtc.org
BUG=2626

Review URL: https://webrtc-codereview.appspot.com/13699004

Review URL: https://webrtc-codereview.appspot.com/13699004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6422 4adac7df-926f-26a2-2b94-8c16560cd09d

talk/app/webrtc/test/peerconnectiontestwrapper.h

diff --git a/talk/app/webrtc/test/peerconnectiontestwrapper.h b/talk/app/webrtc/test/peerconnectiontestwrapper.h
index 46fefaf..05e9b62 100644
--- a/talk/app/webrtc/test/peerconnectiontestwrapper.h
+++ b/talk/app/webrtc/test/peerconnectiontestwrapper.h
@@ -52,6 +52,10 @@
 
   bool CreatePc(const webrtc::MediaConstraintsInterface* constraints);
 
+  talk_base::scoped_refptr<webrtc::DataChannelInterface> CreateDataChannel(
+      const std::string& label,
+      const webrtc::DataChannelInit& init);
+
   // Implements PeerConnectionObserver.
   virtual void OnError() {}
   virtual void OnSignalingChange(
@@ -60,7 +64,7 @@
       webrtc::PeerConnectionObserver::StateType state_changed) {}
   virtual void OnAddStream(webrtc::MediaStreamInterface* stream);
   virtual void OnRemoveStream(webrtc::MediaStreamInterface* stream) {}
-  virtual void OnDataChannel(webrtc::DataChannelInterface* data_channel) {}
+  virtual void OnDataChannel(webrtc::DataChannelInterface* data_channel);
   virtual void OnRenegotiationNeeded() {}
   virtual void OnIceConnectionChange(
       webrtc::PeerConnectionInterface::IceConnectionState new_state) {}
@@ -94,6 +98,7 @@
                    const std::string&> SignalOnIceCandidateReady;
   sigslot::signal1<std::string*> SignalOnSdpCreated;
   sigslot::signal1<const std::string&> SignalOnSdpReady;
+  sigslot::signal1<webrtc::DataChannelInterface*> SignalOnDataChannel;
 
  private:
   void SetLocalDescription(const std::string& type, const std::string& sdp);