Roll libjingle 254:257

content/renderer/media/rtc_peer_connection_handler_unittest.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 <string>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "content/public/common/content_switches.h"
@@ skipping 351 matching lines @@
   request->setSelector(local_stream, component);
   pc_handler_->getStats(request.get());
   EXPECT_EQ(0, request->result()->report_count());
 }
 
 TEST_F(RTCPeerConnectionHandlerTest, OnStateChange) {
   // Ready states.
   webrtc::PeerConnectionObserver::StateType state =
       webrtc::PeerConnectionObserver::kReadyState;
   mock_peer_connection_->SetReadyState(
-      webrtc::PeerConnectionInterface::kOpening);
+      webrtc::PeerConnectionInterface::kHaveRemoteOffer);
   pc_handler_->OnStateChange(state);
   EXPECT_EQ(WebKit::WebRTCPeerConnectionHandlerClient::ReadyStateOpening,
             mock_client_->ready_state());
   mock_peer_connection_->SetReadyState(
       webrtc::PeerConnectionInterface::kActive);
   pc_handler_->OnStateChange(state);
   EXPECT_EQ(WebKit::WebRTCPeerConnectionHandlerClient::ReadyStateActive,
             mock_client_->ready_state());
   mock_peer_connection_->SetReadyState(
-      webrtc::PeerConnectionInterface::kClosing);
-  pc_handler_->OnStateChange(state);
-  EXPECT_EQ(WebKit::WebRTCPeerConnectionHandlerClient::ReadyStateClosing,
-            mock_client_->ready_state());
-  mock_peer_connection_->SetReadyState(
         webrtc::PeerConnectionInterface::kClosed);
   pc_handler_->OnStateChange(state);
   EXPECT_EQ(WebKit::WebRTCPeerConnectionHandlerClient::ReadyStateClosed,
             mock_client_->ready_state());
 
   // Ice states.
   state = webrtc::PeerConnectionObserver::kIceState;
   mock_peer_connection_->SetIceState(
       webrtc::PeerConnectionInterface::kIceGathering);
   pc_handler_->OnStateChange(state);
@@ skipping 67 matching lines @@
       switches::kEnableDataChannels);
 
   WebKit::WebString label = "d1";
   scoped_ptr<WebKit::WebRTCDataChannelHandler> channel(
       pc_handler_->createDataChannel("d1", true));
   EXPECT_TRUE(channel.get() != NULL);
   EXPECT_EQ(label, channel->label());
 }
 
 }  // namespace content