Rolling libjingle r164.

content/renderer/media/peer_connection_handler_jsep.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/peer_connection_handler_jsep.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 164 matching lines @@
   bool return_value =
       native_peer_connection_->ProcessIceMessage(native_candidate.get());
   if (!return_value)
     LOG(ERROR) << "Error processing ICE message";
   return return_value;
 }
 
 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() {
   DVLOG(1) << "PeerConnectionHandlerJsep::stop";
   native_peer_connection_ = NULL;
 }
 
 void PeerConnectionHandlerJsep::OnError() {
   // TODO(grunell): Implement.
   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:
       WebKit::WebPeerConnection00HandlerClient::ReadyState ready_state;
       switch (native_peer_connection_->ready_state()) {
         case webrtc::PeerConnectionInterface::kNew:
           ready_state = WebKit::WebPeerConnection00HandlerClient::ReadyStateNew;
           break;
         case webrtc::PeerConnectionInterface::kOpening:
           ready_state =
@@ skipping 14 matching lines @@
         default:
           NOTREACHED();
           return;
       }
       client_->didChangeReadyState(ready_state);
       break;
     case kIceState:
       // TODO(grunell): Implement when available in native PeerConnection.
       NOTIMPLEMENTED();
       break;
-    case kSdpState:
-      // Not used by JSEP.
-      NOTREACHED();
-      break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 void PeerConnectionHandlerJsep::OnAddStream(
     webrtc::MediaStreamInterface* stream) {
   if (!stream)
     return;
@@ skipping 111 matching lines @@
       break;
     case ActionSDPAnswer:
       *native_action = webrtc::PeerConnectionInterface::kAnswer;
       break;
     default:
       NOTREACHED();
       return false;
   }
   return true;
 }