Enabling usage of native PeerConnection v2 in libjingle.

content/renderer/media/peer_connection_handler_unittest.cc

Index: content/renderer/media/peer_connection_handler_unittest.cc
diff --git a/content/renderer/media/peer_connection_handler_unittest.cc b/content/renderer/media/peer_connection_handler_unittest.cc
index 766db5d60982712533900d8c6fa061fa0ae6bf2f..daf3b9e1fca5d5896570546eb53b9c9aa3ff9f63 100644
--- a/content/renderer/media/peer_connection_handler_unittest.cc
+++ b/content/renderer/media/peer_connection_handler_unittest.cc
@@ -27,15 +27,15 @@ TEST(PeerConnectionHandlerTest, Basic) {
   scoped_refptr<MockMediaStreamImpl> mock_ms_impl(new MockMediaStreamImpl());
   scoped_ptr<MockMediaStreamDependencyFactory> mock_dependency_factory(
       new MockMediaStreamDependencyFactory());
-  mock_dependency_factory->CreatePeerConnectionFactory(NULL, NULL);
+  mock_dependency_factory->CreatePeerConnectionFactory(NULL,
+                                                       NULL,
+                                                       NULL,
+                                                       NULL,
+                                                       NULL);
   scoped_ptr<PeerConnectionHandler> pc_handler(
       new PeerConnectionHandler(mock_client.get(),
                                 mock_ms_impl.get(),
-                                mock_dependency_factory.get(),
-                                NULL,
-                                NULL,
-                                NULL,
-                                NULL));
+                                mock_dependency_factory.get()));
 
   WebKit::WebString server_config(
       WebKit::WebString::fromUTF8("STUN stun.l.google.com:19302"));
@@ -45,8 +45,6 @@ TEST(PeerConnectionHandlerTest, Basic) {
   webrtc::MockPeerConnectionImpl* mock_peer_connection =
       static_cast<webrtc::MockPeerConnectionImpl*>(
           pc_handler->native_peer_connection_.get());
-  EXPECT_EQ(static_cast<webrtc::PeerConnectionObserver*>(pc_handler.get()),
-            mock_peer_connection->observer());
 
   std::string label("label");
   WebKit::WebVector<WebKit::WebMediaStreamSource> source_vector(
@@ -58,11 +56,8 @@ TEST(PeerConnectionHandlerTest, Basic) {
       static_cast<size_t>(1));
   pendingAddStreams[0].initialize(UTF8ToUTF16(label), source_vector);
   pc_handler->produceInitialOffer(pendingAddStreams);
-  EXPECT_EQ(label, mock_ms_impl->video_label());
-  EXPECT_EQ(label, mock_peer_connection->stream_id());
-  EXPECT_TRUE(mock_peer_connection->video_stream());
-  EXPECT_TRUE(mock_peer_connection->connected());
-  EXPECT_TRUE(mock_peer_connection->video_capture_set());
+  EXPECT_EQ(label, mock_peer_connection->stream_label());
+  EXPECT_TRUE(mock_peer_connection->stream_changes_committed());
 
   std::string message("message1");
   pc_handler->handleInitialOffer(WebKit::WebString::fromUTF8(message));
@@ -77,16 +72,20 @@ TEST(PeerConnectionHandlerTest, Basic) {
   EXPECT_EQ(message, mock_client->sdp());
 
   std::string remote_label(label);
-  remote_label.append("-remote");
-  pc_handler->OnAddStream(remote_label, true);
+  remote_label += "-remote";
+  talk_base::scoped_refptr<webrtc::LocalMediaStreamInterface> remote_stream(
+      mock_dependency_factory->CreateLocalMediaStream(remote_label));
+  pc_handler->OnAddStream(remote_stream);
   EXPECT_EQ(remote_label, mock_client->stream_label());
 
-  scoped_refptr<RTCVideoDecoder> rtc_video_decoder(
-      new RTCVideoDecoder(&loop, ""));
-  pc_handler->SetVideoRenderer(label, rtc_video_decoder.get());
-  EXPECT_EQ(label, mock_peer_connection->video_renderer_stream_id());
+  // TODO(grunell): BEFORE COMMIT. Rewrite tests below.
 
-  pc_handler->OnRemoveStream(remote_label, true);
+  // TODO(grunell): BEFORE COMMIT. Need an object?
+  pc_handler->SetVideoRenderer(remote_label, NULL);
+  // TODO(grunell): BEFORE COMMIT. Check the track instead.
+//  EXPECT_EQ(label, mock_peer_connection->video_renderer_stream_id());

[tommi (sloooow) - chröme, 2012/01/24 15:18:56]

remove or fix indent

[Henrik Grunell, 2012/01/26 13:03:16]

Done.

+
+  pc_handler->OnRemoveStream(remote_stream);
   EXPECT_TRUE(mock_client->stream_label().empty());
 
   pc_handler->stop();
@@ -96,15 +95,14 @@ TEST(PeerConnectionHandlerTest, Basic) {
   // in the mock.
   pc_handler.reset();
 
+  // TODO(grunell): BEFORE COMMIT. Move processPendingStreams test up before
+  // stop.
+
   // processPendingStreams must be tested on a new PC handler since removing
   // streams is currently not supported.
   pc_handler.reset(new PeerConnectionHandler(mock_client.get(),
                                              mock_ms_impl.get(),
-                                             mock_dependency_factory.get(),
-                                             NULL,
-                                             NULL,
-                                             NULL,
-                                             NULL));
+                                             mock_dependency_factory.get()));
   pc_handler->initialize(server_config, security_origin);
   EXPECT_TRUE(pc_handler->native_peer_connection_.get());
   mock_peer_connection = static_cast<webrtc::MockPeerConnectionImpl*>(
@@ -113,11 +111,8 @@ TEST(PeerConnectionHandlerTest, Basic) {
   WebKit::WebVector<WebKit::WebMediaStreamDescriptor> pendingRemoveStreams(
       static_cast<size_t>(0));
   pc_handler->processPendingStreams(pendingAddStreams, pendingRemoveStreams);
-  EXPECT_EQ(label, mock_ms_impl->video_label());
-  EXPECT_EQ(label, mock_peer_connection->stream_id());
-  EXPECT_TRUE(mock_peer_connection->video_stream());
-  EXPECT_TRUE(mock_peer_connection->connected());
-  EXPECT_TRUE(mock_peer_connection->video_capture_set());
+  EXPECT_EQ(label, mock_peer_connection->stream_label());
+  EXPECT_TRUE(mock_peer_connection->stream_changes_committed());
 
   pc_handler->stop();
   pc_handler.reset();