Rolling libjingle to 158:159

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 191 matching lines @@
 }
 
 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::kNegotiating:
+        case webrtc::PeerConnectionInterface::kOpening:
           ready_state =
               WebKit::WebPeerConnection00HandlerClient::ReadyStateNegotiating;
           break;
         case webrtc::PeerConnectionInterface::kActive:
           ready_state =
               WebKit::WebPeerConnection00HandlerClient::ReadyStateActive;
           break;
         case webrtc::PeerConnectionInterface::kClosing:
           // Not used by JSEP.
           NOTREACHED();
@@ skipping 132 matching lines @@
       break;
     case ActionSDPAnswer:
       *native_action = webrtc::PeerConnectionInterface::kAnswer;
       break;
     default:
       NOTREACHED();
       return false;
   }
   return true;
 }