diff options
author | mallinath@webrtc.org <mallinath@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-01-28 06:58:42 +0000 |
---|---|---|
committer | mallinath@webrtc.org <mallinath@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-01-28 06:58:42 +0000 |
commit | 62373d69d34d9baa5a1b95c60bc87b374f3e6455 (patch) | |
tree | a7a5bd904b8f0abef618e7e3b84b39b11331708f /app | |
parent | ccbced37a804fd6bc626d126a9694be4b1e9139c (diff) | |
download | talk-62373d69d34d9baa5a1b95c60bc87b374f3e6455.tar.gz |
Revert 5447 "Update talk to 60420316."
> Update talk to 60420316.
>
> TBR=wu@webrtc.org
>
> Review URL: https://webrtc-codereview.appspot.com/7719005
TBR=mallinath@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/7729004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@5448 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'app')
-rw-r--r-- | app/webrtc/peerconnectioninterface_unittest.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/webrtc/peerconnectioninterface_unittest.cc b/app/webrtc/peerconnectioninterface_unittest.cc index 4f3f185..e47e5b1 100644 --- a/app/webrtc/peerconnectioninterface_unittest.cc +++ b/app/webrtc/peerconnectioninterface_unittest.cc @@ -179,6 +179,7 @@ class MockPeerConnectionObserver : public PeerConnectionObserver { EXPECT_EQ(pc_->ice_gathering_state(), new_state); } virtual void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) { + EXPECT_NE(PeerConnectionInterface::kIceGatheringNew, pc_->ice_gathering_state()); |