Roll libjingle 257:260.

content/renderer/media/rtc_peer_connection_handler.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/rtc_peer_connection_handler.h"
 
 #include <string>
 #include <utility>
 
 #include "base/command_line.h"
@@ skipping 44 matching lines @@
       return WebKit::WebRTCPeerConnectionHandlerClient::ICEStateClosed;
     default:
       NOTREACHED();
       return WebKit::WebRTCPeerConnectionHandlerClient::ICEStateClosed;
   }
 }
 
 static WebKit::WebRTCPeerConnectionHandlerClient::ReadyState
 GetWebKitReadyState(webrtc::PeerConnectionInterface::ReadyState ready_state) {
   switch (ready_state) {
-    case webrtc::PeerConnectionInterface::kNew:
+    case webrtc::PeerConnectionInterface::kStable:
       return WebKit::WebRTCPeerConnectionHandlerClient::ReadyStateNew;

[Ronghua Wu (Left Chromium), 2013/01/11 00:52:32]

Per, what should we return here since the
WebRTCPeerConnectionHandlerClient::ReadyStateStable is not defined yet.

[perkj_chrome, 2013/01/11 07:57:01]

Please check later today if Tommy Ws cl for adding
WebRTCPeerConnectionHandlerClient::SignalingState is in. If so use
SignalingState instead of ReadyState. 

Please also rename the function to GetWebKitSignalingState.

If it's not in - just return ReadyStateActive and let me and Tommy now so we can
update as soon as his patch is in.

Thanks for doing this.
On 2013/01/11 00:52:32, Ronghua Wu wrote:

[Ronghua Wu (Left Chromium), 2013/01/11 19:03:01]

Done.

 
     case webrtc::PeerConnectionInterface::kHaveLocalOffer:
     case webrtc::PeerConnectionInterface::kHaveLocalPrAnswer:
     case webrtc::PeerConnectionInterface::kHaveRemoteOffer:
     case webrtc::PeerConnectionInterface::kHaveRemotePrAnswer:
       return WebKit::WebRTCPeerConnectionHandlerClient::ReadyStateOpening;
-    case webrtc::PeerConnectionInterface::kActive:
-      return WebKit::WebRTCPeerConnectionHandlerClient::ReadyStateActive;
     case webrtc::PeerConnectionInterface::kClosed:
       return WebKit::WebRTCPeerConnectionHandlerClient::ReadyStateClosed;
     default:
       NOTREACHED();
       return WebKit::WebRTCPeerConnectionHandlerClient::ReadyStateClosed;
   }
 }
 
 static WebKit::WebRTCSessionDescription
 CreateWebKitSessionDescription(
@@ skipping 425 matching lines @@
   native_peer_connection_ = NULL;
 }
 
 void RTCPeerConnectionHandler::OnError() {
   // TODO(perkj): Implement.
   NOTIMPLEMENTED();
 }
 
 void RTCPeerConnectionHandler::OnStateChange(StateType state_changed) {
   switch (state_changed) {
-    case kReadyState: {
+    case kSignalingState: {
       WebKit::WebRTCPeerConnectionHandlerClient::ReadyState ready_state =
           GetWebKitReadyState(native_peer_connection_->ready_state());
       client_->didChangeReadyState(ready_state);
       break;
     }
     case kIceState: {
       WebKit::WebRTCPeerConnectionHandlerClient::ICEState ice_state =
           GetWebKitIceState(native_peer_connection_->ice_state());
       client_->didChangeICEState(ice_state);
       break;
@@ skipping 75 matching lines @@
   webrtc::SessionDescriptionInterface* native_desc =
       dependency_factory_->CreateSessionDescription(type, sdp);
 
   LOG_IF(ERROR, !native_desc) << "Failed to create native session description."
                               << " Type: " << type << " SDP: " << sdp;
 
   return native_desc;
 }
 
 }  // namespace content