Rolling libjingle r164.

Review URL: https://chromiumcodereview.appspot.com/10824143

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

DEPS

@@ -18,7 +18,7 @@ vars = {
   "nacl_tools_revision": "9330",  # native_client/DEPS: tools_rev
   "gtm_revision": "534",
 
-  "libjingle_revision": "163",
+  "libjingle_revision": "165",
   "libphonenumber_revision": "456",
   "libvpx_revision": "149334",
   "lss_revision": "11",

content/renderer/media/mock_media_stream_dependency_factory.cc

@@ -82,14 +82,6 @@ cricket::VideoCapturer* MockLocalVideoTrack::GetVideoCapture() {
   return NULL;
 }
 
-void MockLocalVideoTrack::SetRenderer(VideoRendererWrapperInterface* renderer) {
-  renderer_ = renderer;
-}
-
-VideoRendererWrapperInterface* MockLocalVideoTrack::GetRenderer() {
-  return renderer_;
-}
-
 void MockLocalVideoTrack::AddRenderer(VideoRendererInterface* renderer) {
   NOTIMPLEMENTED();
 }

content/renderer/media/mock_media_stream_dependency_factory.h

@@ -17,12 +17,9 @@ class MockLocalVideoTrack : public LocalVideoTrackInterface {
  public:
   explicit MockLocalVideoTrack(std::string label)
     : enabled_(false),
-      label_(label),
-      renderer_(NULL) {
+      label_(label) {
   }
   virtual cricket::VideoCapturer* GetVideoCapture() OVERRIDE;
-  virtual void SetRenderer(VideoRendererWrapperInterface* renderer) OVERRIDE;
-  virtual VideoRendererWrapperInterface* GetRenderer() OVERRIDE;
   virtual void AddRenderer(VideoRendererInterface* renderer) OVERRIDE;
   virtual void RemoveRenderer(VideoRendererInterface* renderer) OVERRIDE;
   virtual cricket::VideoRenderer* FrameInput() OVERRIDE;
@@ -41,7 +38,6 @@ class MockLocalVideoTrack : public LocalVideoTrackInterface {
  private:
   bool enabled_;
   std::string label_;
-  VideoRendererWrapperInterface* renderer_;
 };
 
 class MockLocalAudioTrack : public LocalAudioTrackInterface {

content/renderer/media/mock_peer_connection_impl.cc

@@ -42,7 +42,6 @@ const char MockPeerConnectionImpl::kDummyOffer[] = "dummy offer";
 MockPeerConnectionImpl::MockPeerConnectionImpl(
     MockMediaStreamDependencyFactory* factory)
     : dependency_factory_(factory),
-      stream_changes_committed_(false),
       local_streams_(new talk_base::RefCountedObject<MockStreamCollection>),
       remote_streams_(new talk_base::RefCountedObject<MockStreamCollection>),
       hint_audio_(false),
@@ -54,15 +53,6 @@ MockPeerConnectionImpl::MockPeerConnectionImpl(
 
 MockPeerConnectionImpl::~MockPeerConnectionImpl() {}
 
-void MockPeerConnectionImpl::ProcessSignalingMessage(const std::string& msg) {
-  signaling_message_ = msg;
-}
-
-bool MockPeerConnectionImpl::Send(const std::string& msg) {
-  NOTIMPLEMENTED();
-  return false;
-}
-
 talk_base::scoped_refptr<StreamCollectionInterface>
 MockPeerConnectionImpl::local_streams() {
   return local_streams_;
@@ -88,43 +78,16 @@ bool MockPeerConnectionImpl::AddStream(
   return true;
 }
 
-void MockPeerConnectionImpl::RemoveStream(LocalMediaStreamInterface* stream) {
-  DCHECK_EQ(stream_label_, stream->label());
-  stream_label_.clear();
-}
-
 void MockPeerConnectionImpl::RemoveStream(
     MediaStreamInterface* local_stream) {
   DCHECK_EQ(stream_label_, local_stream->label());
   stream_label_.clear();
 }
 
-bool MockPeerConnectionImpl::RemoveStream(const std::string& label) {
-  if (stream_label_ != label)
-    return false;
-  stream_label_.clear();
-  return true;
-}
-
-void MockPeerConnectionImpl::CommitStreamChanges() {
-  stream_changes_committed_ = true;
-}
-
-void MockPeerConnectionImpl::Close() {
-  signaling_message_.clear();
-  stream_label_.clear();
-  stream_changes_committed_ = false;
-}
-
 MockPeerConnectionImpl::ReadyState MockPeerConnectionImpl::ready_state() {
   return ready_state_;
 }
 
-MockPeerConnectionImpl::SdpState MockPeerConnectionImpl::sdp_state() {
-  NOTIMPLEMENTED();
-  return kSdpNew;
-}
-
 bool MockPeerConnectionImpl::StartIce(IceOptions options) {
   ice_options_ = options;
   return true;

content/renderer/media/mock_peer_connection_impl.h

@@ -23,8 +23,6 @@ class MockPeerConnectionImpl : public PeerConnectionInterface {
   explicit MockPeerConnectionImpl(MockMediaStreamDependencyFactory* factory);
 
   // 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>
@@ -32,13 +30,8 @@ class MockPeerConnectionImpl : public PeerConnectionInterface {
   virtual void AddStream(LocalMediaStreamInterface* stream) OVERRIDE;
   virtual bool AddStream(MediaStreamInterface* local_stream,
                          const MediaConstraintsInterface* constraints) OVERRIDE;
-  virtual void RemoveStream(LocalMediaStreamInterface* stream) OVERRIDE;
   virtual void RemoveStream(MediaStreamInterface* local_stream) OVERRIDE;
-  virtual bool RemoveStream(const std::string& label) OVERRIDE;
-  virtual void CommitStreamChanges() OVERRIDE;
-  virtual void Close() OVERRIDE;
   virtual ReadyState ready_state() OVERRIDE;
-  virtual SdpState sdp_state() OVERRIDE;
   virtual bool StartIce(IceOptions options) OVERRIDE;
 
   virtual webrtc::SessionDescriptionInterface* CreateOffer(
@@ -76,12 +69,9 @@ class MockPeerConnectionImpl : public PeerConnectionInterface {
   virtual IceState ice_state() OVERRIDE;
 
   void AddRemoteStream(MediaStreamInterface* stream);
-  void ClearStreamChangesCommitted() { stream_changes_committed_ = false; }
   void SetReadyState(ReadyState state) { ready_state_ = state; }
 
-  const std::string& signaling_message() const { return signaling_message_; }
   const std::string& stream_label() const { return stream_label_; }
-  bool stream_changes_committed() const { return stream_changes_committed_; }
   bool hint_audio() const { return hint_audio_; }
   bool hint_video() const { return hint_video_; }
   Action action() const { return action_; }
@@ -100,9 +90,7 @@ class MockPeerConnectionImpl : public PeerConnectionInterface {
   // Used for creating MockSessionDescription.
   MockMediaStreamDependencyFactory* dependency_factory_;
 
-  std::string signaling_message_;
   std::string stream_label_;
-  bool stream_changes_committed_;
   talk_base::scoped_refptr<MockStreamCollection> local_streams_;
   talk_base::scoped_refptr<MockStreamCollection> remote_streams_;
   scoped_ptr<webrtc::SessionDescriptionInterface> local_desc_;

content/renderer/media/peer_connection_handler_jsep.cc

@@ -182,13 +182,11 @@ bool PeerConnectionHandlerJsep::processIceMessage(
 void PeerConnectionHandlerJsep::addStream(
     const WebKit::WebMediaStreamDescriptor& stream) {
   AddStream(stream);
-  native_peer_connection_->CommitStreamChanges();
 }
 
 void PeerConnectionHandlerJsep::removeStream(
     const WebKit::WebMediaStreamDescriptor& stream) {
   RemoveStream(stream);
-  native_peer_connection_->CommitStreamChanges();
 }
 
 void PeerConnectionHandlerJsep::stop() {
@@ -201,16 +199,6 @@ void PeerConnectionHandlerJsep::OnError() {
   NOTIMPLEMENTED();
 }
 
-void PeerConnectionHandlerJsep::OnMessage(const std::string& msg) {
-  // TODO(grunell): Implement.
-  NOTIMPLEMENTED();
-}
-
-void PeerConnectionHandlerJsep::OnSignalingMessage(const std::string& msg) {
-  // Not used by JSEP PeerConnection.
-  NOTREACHED();
-}
-
 void PeerConnectionHandlerJsep::OnStateChange(StateType state_changed) {
   switch (state_changed) {
     case kReadyState:
@@ -245,10 +233,6 @@ void PeerConnectionHandlerJsep::OnStateChange(StateType state_changed) {
       // TODO(grunell): Implement when available in native PeerConnection.
       NOTIMPLEMENTED();
       break;
-    case kSdpState:
-      // Not used by JSEP.
-      NOTREACHED();
-      break;
     default:
       NOTREACHED();
       break;

content/renderer/media/peer_connection_handler_jsep.h

@@ -55,8 +55,6 @@ class CONTENT_EXPORT PeerConnectionHandlerJsep
 
   // webrtc::PeerConnectionObserver implementation
   virtual void OnError() OVERRIDE;
-  virtual void OnMessage(const std::string& msg) OVERRIDE;
-  virtual void OnSignalingMessage(const std::string& msg) OVERRIDE;
   virtual void OnStateChange(StateType state_changed) OVERRIDE;
   virtual void OnAddStream(webrtc::MediaStreamInterface* stream) OVERRIDE;
   virtual void OnRemoveStream(webrtc::MediaStreamInterface* stream) OVERRIDE;

content/renderer/media/peer_connection_handler_jsep_unittest.cc

@@ -225,7 +225,6 @@ TEST_F(PeerConnectionHandlerJsepTest, Basic) {
 
   pc_handler_->addStream(local_stream);
   EXPECT_EQ(stream_label, mock_peer_connection_->stream_label());
-  EXPECT_TRUE(mock_peer_connection_->stream_changes_committed());
 
   // On add stream. ( Remote stream received)
   std::string remote_stream_label("remote_stream");
@@ -239,8 +238,6 @@ TEST_F(PeerConnectionHandlerJsepTest, Basic) {
       static_cast<size_t>(0));
   pc_handler_->removeStream(local_stream);
   EXPECT_EQ("", mock_peer_connection_->stream_label());
-  mock_peer_connection_->ClearStreamChangesCommitted();
-  EXPECT_TRUE(!mock_peer_connection_->stream_changes_committed());
 
   // On remove stream.
   pc_handler_->OnRemoveStream(remote_stream);
@@ -249,7 +246,6 @@ TEST_F(PeerConnectionHandlerJsepTest, Basic) {
   // Add stream again.
   pc_handler_->addStream(local_stream);
   EXPECT_EQ(stream_label, mock_peer_connection_->stream_label());
-  EXPECT_TRUE(mock_peer_connection_->stream_changes_committed());
 
   // On state change.
   mock_peer_connection_->SetReadyState(

content/renderer/media/rtc_video_decoder_unittest.cc

@@ -152,13 +152,6 @@ class MockVideoTrack : public webrtc::VideoTrackInterface {
       webrtc::ObserverInterface* observer) OVERRIDE {
     NOTIMPLEMENTED();
   }
-  void SetRenderer(webrtc::VideoRendererWrapperInterface* renderer) OVERRIDE {
-     NOTIMPLEMENTED();
-  }
-  virtual webrtc::VideoRendererWrapperInterface* GetRenderer() OVERRIDE {
-    NOTIMPLEMENTED();
-    return NULL;
-  }
   MOCK_METHOD1(AddRenderer, void(webrtc::VideoRendererInterface* renderer));
   MOCK_METHOD1(RemoveRenderer, void(webrtc::VideoRendererInterface* renderer));
 

third_party/libjingle/README.chromium

@@ -2,7 +2,7 @@ Name: Libjingle library. Used for p2p voice and video communication.
 Short Name: libjingle
 URL: http://code.google.com/p/libjingle/
 Version: unknown
-Revision: 163
+Revision: 165
 License: BSD
 License File: source/COPYING
 Security Critical: yes

third_party/libjingle/libjingle.gyp

@@ -524,19 +524,13 @@
         'source/talk/app/webrtc/peerconnectionfactory.cc',
         'source/talk/app/webrtc/peerconnectionfactory.h',
         'source/talk/app/webrtc/peerconnectioninterface.h',
+        'source/talk/app/webrtc/peerconnectionproxy.cc',
+        'source/talk/app/webrtc/peerconnectionproxy.h',
         'source/talk/app/webrtc/portallocatorfactory.cc',
         'source/talk/app/webrtc/portallocatorfactory.h',
-        'source/talk/app/webrtc/roaperrorcodes.h',
-        'source/talk/app/webrtc/roapmessages.cc',
-        'source/talk/app/webrtc/roapmessages.h',
-        'source/talk/app/webrtc/roapsession.cc',
-        'source/talk/app/webrtc/roapsession.h',
-        'source/talk/app/webrtc/roapsignaling.cc',
-        'source/talk/app/webrtc/roapsignaling.h',
         'source/talk/app/webrtc/streamcollection.h',
         'source/talk/app/webrtc/videotrackrenderers.cc',
         'source/talk/app/webrtc/videotrackrenderers.h',
-        'source/talk/app/webrtc/videorendererimpl.cc',
         'source/talk/app/webrtc/videotrack.cc',
         'source/talk/app/webrtc/videotrack.h',
         'source/talk/app/webrtc/webrtcsdp.cc',