Rolling libjingle r164.

content/renderer/media/peer_connection_handler_jsep_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/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "content/renderer/media/media_stream_extra_data.h"
 #include "content/renderer/media/mock_media_stream_dependency_factory.h"
@@ skipping 207 matching lines @@
   EXPECT_TRUE(mock_peer_connection_->sdp_mid().empty());
   EXPECT_EQ(UTF16ToUTF8(sdp), mock_peer_connection_->ice_sdp());
 
   // Add stream.
   std::string stream_label = "local_stream";
   WebKit::WebMediaStreamDescriptor local_stream(
       CreateLocalMediaStream(stream_label));
 
   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");
   talk_base::scoped_refptr<webrtc::MediaStreamInterface> remote_stream(
       AddRemoteMockMediaStream(remote_stream_label, "video", "audio"));
   pc_handler_->OnAddStream(remote_stream);
   EXPECT_EQ(remote_stream_label, mock_client_->stream_label());
 
   // Remove stream.
   WebKit::WebVector<WebKit::WebMediaStreamDescriptor> empty_streams(
       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);
   EXPECT_TRUE(mock_client_->stream_label().empty());
 
   // 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(
       webrtc::PeerConnectionInterface::kActive);
   webrtc::PeerConnectionObserver::StateType state =
       webrtc::PeerConnectionObserver::kReadyState;
   pc_handler_->OnStateChange(state);
   EXPECT_EQ(WebKit::WebPeerConnection00HandlerClient::ReadyStateActive,
             mock_client_->ready_state());
 
@@ skipping 41 matching lines @@
   talk_base::scoped_refptr<webrtc::MediaStreamInterface> stream_2(
       AddRemoteMockMediaStream(stream_label_2, video_track_label_2,
                                audio_track_label_2));
 
   pc_handler_->OnAddStream(stream_1);
   EXPECT_EQ(stream_label_1, mock_client_->stream_label());
 
   pc_handler_->OnAddStream(stream_2);
   EXPECT_EQ(stream_label_2, mock_client_->stream_label());
 }