Hookup the MediaStream glue for Adding and Removing tracks to an existing MediaStream.

content/renderer/media/media_stream_dependency_factory_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 "base/memory/scoped_ptr.h"
 #include "content/common/media/media_stream_options.h"
 #include "content/renderer/media/media_stream_extra_data.h"
 #include "content/renderer/media/media_stream_source_extra_data.h"
 #include "content/renderer/media/mock_media_stream_dependency_factory.h"
 #include "content/renderer/media/mock_web_rtc_peer_connection_handler_client.h"
@@ skipping 31 matching lines @@
   bool result_;
   WebKit::WebMediaStream* description_;
 };
 
 class MediaStreamDependencyFactoryTest : public ::testing::Test {
  public:
   virtual void SetUp() {
     dependency_factory_.reset(new MockMediaStreamDependencyFactory());
   }
 
-  WebKit::WebMediaStream CreateWebKitMediaStream(bool audio,
-                                                           bool video) {
+  WebKit::WebMediaStream CreateWebKitMediaStream(bool audio, bool video) {
     WebKit::WebVector<WebKit::WebMediaStreamSource> audio_sources(
-                      audio ? static_cast<size_t>(1) : 0);
+        audio ? static_cast<size_t>(1) : 0);
     WebKit::WebVector<WebKit::WebMediaStreamSource> video_sources(
         video ? static_cast<size_t>(1) : 0);
 
     if (audio) {
       StreamDeviceInfo info;
       info.device.type = content::MEDIA_DEVICE_AUDIO_CAPTURE;
       info.device.name = "audio";
       info.device.sample_rate = 0;
       info.device.channel_layout = 0;
       info.session_id = 99;
@@ skipping 35 matching lines @@
     // Change the state of the created source to live. This should trigger
     // MediaSourceCreatedObserver::OnCreateNativeSourcesComplete
     if (dependency_factory_->last_video_source()) {
       dependency_factory_->last_audio_source()->SetLive();
       dependency_factory_->last_video_source()->SetLive();
     }
     EXPECT_TRUE(observer.result());
     EXPECT_TRUE(observer.description() == descriptor);
   }
 
+  void VerifyMediaStream(const WebKit::WebMediaStream& stream_desc,
+                         size_t num_audio_tracks,
+                         size_t num_video_tracks) {
+    content::MediaStreamExtraData* extra_data =
+        static_cast<content::MediaStreamExtraData*>(stream_desc.extraData());
+    ASSERT_TRUE(extra_data && extra_data->stream());
+    EXPECT_TRUE(extra_data->is_local());
+    EXPECT_EQ(num_audio_tracks, extra_data->stream()->GetAudioTracks().size());
+    EXPECT_EQ(num_video_tracks, extra_data->stream()->GetVideoTracks().size());
+  }
+
  protected:
   scoped_ptr<MockMediaStreamDependencyFactory> dependency_factory_;
 };
 
 TEST_F(MediaStreamDependencyFactoryTest, CreateRTCPeerConnectionHandler) {
   MockWebRTCPeerConnectionHandlerClient client_jsep;
   scoped_ptr<WebKit::WebRTCPeerConnectionHandler> pc_handler(
       dependency_factory_->CreateRTCPeerConnectionHandler(&client_jsep));
   EXPECT_TRUE(pc_handler.get() != NULL);
 }
 
 TEST_F(MediaStreamDependencyFactoryTest, CreateNativeMediaStream) {
   WebKit::WebMediaStream stream_desc = CreateWebKitMediaStream(true, true);
   CreateNativeSources(&stream_desc);
 
   dependency_factory_->CreateNativeLocalMediaStream(&stream_desc);
-
-  content::MediaStreamExtraData* extra_data =
-      static_cast<content::MediaStreamExtraData*>(stream_desc.extraData());
-  ASSERT_TRUE(extra_data && extra_data->stream());
-  EXPECT_TRUE(extra_data->is_local());
-  EXPECT_EQ(1u, extra_data->stream()->GetAudioTracks().size());
-  EXPECT_EQ(1u, extra_data->stream()->GetVideoTracks().size());
+  VerifyMediaStream(stream_desc, 1, 1);
 }
 
 // Test that we don't crash if a MediaStream is created in WebKit with unknown
 // sources. This can for example happen if a MediaStream is created with
 // remote tracks.
 TEST_F(MediaStreamDependencyFactoryTest, CreateNativeMediaStreamWithoutSource) {
   // Create a WebKit MediaStream description.
   WebKit::WebMediaStream stream_desc;
   WebKit::WebVector<WebKit::WebMediaStreamSource> audio_sources(
       static_cast<size_t>(1));
   audio_sources[0].initialize("audio source",
                               WebKit::WebMediaStreamSource::TypeAudio,
                               "something");
   WebKit::WebVector<WebKit::WebMediaStreamSource> video_sources(
       static_cast<size_t>(1));
   video_sources[0].initialize("video source",
                               WebKit::WebMediaStreamSource::TypeVideo,
                               "something");
   stream_desc.initialize("new stream", audio_sources, video_sources);
 
   EXPECT_TRUE(dependency_factory_->EnsurePeerConnectionFactory());
   dependency_factory_->CreateNativeLocalMediaStream(&stream_desc);
-  MediaStreamExtraData* extra_data = static_cast<MediaStreamExtraData*>(
-      stream_desc.extraData());
-  ASSERT_TRUE(extra_data && extra_data->stream());
-  EXPECT_TRUE(extra_data->is_local());
-  EXPECT_EQ(0u, extra_data->stream()->GetVideoTracks().size());
-  EXPECT_EQ(0u, extra_data->stream()->GetAudioTracks().size());
+  VerifyMediaStream(stream_desc, 0, 0);
+}
+
+TEST_F(MediaStreamDependencyFactoryTest, AddAndRemoveNativeTrack) {
+  WebKit::WebMediaStream stream_desc = CreateWebKitMediaStream(true, true);
+  CreateNativeSources(&stream_desc);
+
+  dependency_factory_->CreateNativeLocalMediaStream(&stream_desc);
+  VerifyMediaStream(stream_desc, 1, 1);
+
+  WebKit::WebVector<WebKit::WebMediaStreamTrack> audio_tracks;
+  stream_desc.audioTracks(audio_tracks);
+  EXPECT_TRUE(dependency_factory_->RemoveNativeMediaStreamTrack(
+      stream_desc, audio_tracks[0]));
+  VerifyMediaStream(stream_desc, 0, 1);
+
+  EXPECT_TRUE(dependency_factory_->AddNativeMediaStreamTrack(
+      stream_desc, audio_tracks[0]));
+  VerifyMediaStream(stream_desc, 1, 1);
+
+  WebKit::WebVector<WebKit::WebMediaStreamTrack> video_tracks;
+  stream_desc.videoTracks(video_tracks);
+  EXPECT_TRUE(dependency_factory_->RemoveNativeMediaStreamTrack(
+      stream_desc, video_tracks[0]));
+  VerifyMediaStream(stream_desc, 1, 0);
+
+  EXPECT_TRUE(dependency_factory_->AddNativeMediaStreamTrack(
+      stream_desc, video_tracks[0]));
+  VerifyMediaStream(stream_desc, 1, 1);
 }
 
 }  // namespace content