Reland r185114 "Roll libjingle r281:r286"

BUG=172316,177139,178968
TBR=sergeyu,macpherson,cmp

Landing libjingle roll again after perf expectations has been updated.

Review URL: https://codereview.chromium.org/12387008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185153 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 3 insertions, 12 deletions

diff --git a/content/renderer/media/mock_media_stream_dependency_factory.cc b/content/renderer/media/mock_media_stream_dependency_factory.cc
index 79fb8c5..af3177f 100644
--- a/content/renderer/media/mock_media_stream_dependency_factory.cc
+++ b/content/renderer/media/mock_media_stream_dependency_factory.cc
@@ -74,14 +74,6 @@ class MockMediaStream : public webrtc::MediaStreamInterface {
     VideoTrackVector::iterator it = FindTrack(&video_track_vector_, track_id);
     return it == video_track_vector_.end() ? NULL : *it;
   }
-  virtual webrtc::AudioTracks* audio_tracks() OVERRIDE {
-    NOTIMPLEMENTED();
-    return NULL;
-  }
-  virtual webrtc::VideoTracks* video_tracks() OVERRIDE {
-    NOTIMPLEMENTED();
-    return NULL;
-  }
   virtual void RegisterObserver(ObserverInterface* observer) OVERRIDE {
     NOTIMPLEMENTED();
   }
diff --git a/content/renderer/media/mock_peer_connection_impl.h b/content/renderer/media/mock_peer_connection_impl.h
index a055fcc..353f917 100644
--- a/content/renderer/media/mock_peer_connection_impl.h
+++ b/content/renderer/media/mock_peer_connection_impl.h
@@ -40,10 +40,6 @@ class MockPeerConnectionImpl : public webrtc::PeerConnectionInterface {
 
   virtual bool GetStats(webrtc::StatsObserver* observer,
                         webrtc::MediaStreamTrackInterface* track) OVERRIDE;
-  virtual ReadyState ready_state() OVERRIDE {
-    NOTIMPLEMENTED();
-    return PeerConnectionInterface::kStable;
-  }
   virtual SignalingState signaling_state() OVERRIDE {
     NOTIMPLEMENTED();
     return PeerConnectionInterface::kStable;
@@ -60,6 +56,9 @@ class MockPeerConnectionImpl : public webrtc::PeerConnectionInterface {
     NOTIMPLEMENTED();
     return PeerConnectionInterface::kIceGatheringNew;
   }
+  virtual void Close() OVERRIDE {
+    NOTIMPLEMENTED();
+  }
 
   virtual const webrtc::SessionDescriptionInterface* local_description()
       const OVERRIDE;