Rolling libjingle revison r163.

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 192 matching lines @@
 
   // Start ICE.
   WebKit::WebICEOptions options;
   options.initialize(WebKit::WebICEOptions::CandidateTypeAll);
   EXPECT_TRUE(pc_handler_->startIce(options));
   EXPECT_EQ(webrtc::PeerConnectionInterface::kUseAll,
             mock_peer_connection_->ice_options());
 
   // Process ICE message.
   WebKit::WebICECandidateDescriptor candidate;
-  WebKit::WebString label = "test label";
+  WebKit::WebString label = "0";
   sdp = "test sdp";
   candidate.initialize(label, sdp);
   EXPECT_TRUE(pc_handler_->processIceMessage(candidate));
-  EXPECT_EQ(UTF16ToUTF8(label), mock_peer_connection_->ice_label());
+  EXPECT_EQ(UTF16ToUTF8(label), mock_peer_connection_->sdp_mid());

[Ronghua Wu (Left Chromium), 2012/07/30 18:09:10]

will them equal?

[Mallinath (Gone from Chromium), 2012/07/30 18:42:08]

Removed label and using sdp_mid as per impl.

   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());
@@ skipping 25 matching lines @@
   // 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());
 
   // On ICE candidate.
-  std::string candidate_label = "test label";
+  std::string candidate_label = "0";
   std::string candidate_sdp = "test sdp";
+  int sdp_mline_index = 0;
   scoped_ptr<webrtc::IceCandidateInterface> native_candidate(
       mock_dependency_factory_->CreateIceCandidate(candidate_label,
-                                                  candidate_sdp));
+                                                   sdp_mline_index,
+                                                   candidate_sdp));
   pc_handler_->OnIceCandidate(native_candidate.get());
   EXPECT_EQ(candidate_label, mock_client_->candidate_label());
   EXPECT_EQ(candidate_sdp, mock_client_->candidate_sdp());
   EXPECT_TRUE(mock_client_->more_to_follow());
 
   // On ICE complete.
   pc_handler_->OnIceComplete();
   EXPECT_TRUE(mock_client_->candidate_label().empty());
   EXPECT_TRUE(mock_client_->candidate_sdp().empty());
   EXPECT_FALSE(mock_client_->more_to_follow());
@@ skipping 23 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());
 }