Renamed WebMediaStreamComponent and WebMediaStreamDescriptor to WebMediaStreamTrack & WebMediaStream

content/renderer/media/media_stream_impl_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 "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "content/renderer/media/media_stream_extra_data.h"
 #include "content/renderer/media/media_stream_impl.h"
 #include "content/renderer/media/mock_media_stream_dependency_factory.h"
 #include "content/renderer/media/mock_media_stream_dispatcher.h"
 #include "content/renderer/media/video_capture_impl_manager.h"
 #include "media/base/video_decoder.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamComponent.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamDescriptor.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStream.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamSource.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamTrack.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h"
 
 namespace content {
 
 class MediaStreamImplUnderTest : public MediaStreamImpl {
  public:
   enum RequestState {
     REQUEST_NOT_STARTED,
     REQUEST_NOT_COMPLETE,
@@ skipping 14 matching lines @@
     WebKit::WebVector<WebKit::WebMediaStreamSource> audio_sources(
         audio ? static_cast<size_t>(1) : 0);
     WebKit::WebVector<WebKit::WebMediaStreamSource> video_sources(
         video ? static_cast<size_t>(1) : 0);
     state_ = REQUEST_NOT_COMPLETE;
     requestUserMedia(user_media_request, audio_sources,
                      video_sources);
   }
 
   virtual void CompleteGetUserMediaRequest(
-      const WebKit::WebMediaStreamDescriptor& stream,
+      const WebKit::WebMediaStream& stream,
       WebKit::WebUserMediaRequest* request_info,
       bool request_succeeded) OVERRIDE {
     last_generated_stream_ = stream;
     state_ = request_succeeded ? REQUEST_SUCCEEDED : REQUEST_FAILED;
   }
 
-  virtual WebKit::WebMediaStreamDescriptor GetMediaStream(
+  virtual WebKit::WebMediaStream GetMediaStream(
       const GURL& url) OVERRIDE {
     return last_generated_stream_;
   }
 
   using MediaStreamImpl::OnLocalMediaStreamStop;
 
-  const WebKit::WebMediaStreamDescriptor& last_generated_stream() {
+  const WebKit::WebMediaStream& last_generated_stream() {
     return last_generated_stream_;
   }
 
   RequestState request_state() const { return state_; }
 
  private:
-  WebKit::WebMediaStreamDescriptor last_generated_stream_;
+  WebKit::WebMediaStream last_generated_stream_;
   RequestState state_;
 };
 
 class MediaStreamImplTest : public ::testing::Test {
  public:
   void SetUp() {
     // Create our test object.
     ms_dispatcher_.reset(new MockMediaStreamDispatcher());
     scoped_refptr<VideoCaptureImplManager> vc_manager(
         new VideoCaptureImplManager());
     dependency_factory_.reset(new MockMediaStreamDependencyFactory());
     ms_impl_.reset(new MediaStreamImplUnderTest(ms_dispatcher_.get(),
                                                 vc_manager.get(),
                                                 dependency_factory_.get()));
   }
 
-  WebKit::WebMediaStreamDescriptor RequestLocalMediaStream(bool audio,
+  WebKit::WebMediaStream RequestLocalMediaStream(bool audio,
                                                            bool video) {
     ms_impl_->RequestUserMedia(audio, video);
     FakeMediaStreamDispatcherComplete();
     if (video)
       ChangeVideoSourceStateToLive();
     if (audio)
       ChangeAudioSourceStateToLive();
 
     EXPECT_EQ(MediaStreamImplUnderTest::REQUEST_SUCCEEDED,
               ms_impl_->request_state());
 
-    WebKit::WebMediaStreamDescriptor desc = ms_impl_->last_generated_stream();
+    WebKit::WebMediaStream desc = ms_impl_->last_generated_stream();
     content::MediaStreamExtraData* extra_data =
         static_cast<content::MediaStreamExtraData*>(desc.extraData());
     if (!extra_data || !extra_data->local_stream()) {
       ADD_FAILURE();
       return desc;
     }
 
     if (audio)
       EXPECT_EQ(1u, extra_data->local_stream()->audio_tracks()->count());
     if (video)
@@ skipping 38 matching lines @@
   }
 
  protected:
   scoped_ptr<MockMediaStreamDispatcher> ms_dispatcher_;
   scoped_ptr<MediaStreamImplUnderTest> ms_impl_;
   scoped_ptr<MockMediaStreamDependencyFactory> dependency_factory_;
 };
 
 TEST_F(MediaStreamImplTest, LocalMediaStream) {
   // Test a stream with both audio and video.
-  WebKit::WebMediaStreamDescriptor mixed_desc = RequestLocalMediaStream(true,
-                                                                        true);
+  WebKit::WebMediaStream mixed_desc = RequestLocalMediaStream(true, true);
   // Create a renderer for the stream.
   scoped_refptr<media::VideoDecoder> mixed_decoder(
       ms_impl_->GetVideoDecoder(GURL(), base::MessageLoopProxy::current()));
   EXPECT_TRUE(mixed_decoder.get() != NULL);
 
   // Test a stream with audio only.
-  WebKit::WebMediaStreamDescriptor audio_desc = RequestLocalMediaStream(true,
-                                                                        false);
+  WebKit::WebMediaStream audio_desc = RequestLocalMediaStream(true, false);
   scoped_refptr<media::VideoDecoder> audio_decoder(
       ms_impl_->GetVideoDecoder(GURL(), base::MessageLoopProxy::current()));
   EXPECT_TRUE(audio_decoder.get() == NULL);
 
   // Test a stream with video only.
-  WebKit::WebMediaStreamDescriptor video_desc = RequestLocalMediaStream(false,
-                                                                        true);
+  WebKit::WebMediaStream video_desc = RequestLocalMediaStream(false, true);
   scoped_refptr<media::VideoDecoder> video_decoder(
       ms_impl_->GetVideoDecoder(GURL(), base::MessageLoopProxy::current()));
   EXPECT_TRUE(video_decoder.get() != NULL);
 
   // Stop generated local streams.
   ms_impl_->OnLocalMediaStreamStop(mixed_desc.label().utf8());
   EXPECT_EQ(1, ms_dispatcher_->stop_stream_counter());
   ms_impl_->OnLocalMediaStreamStop(audio_desc.label().utf8());
   EXPECT_EQ(2, ms_dispatcher_->stop_stream_counter());
 
@@ skipping 49 matching lines @@
   ms_impl_->FrameWillClose(NULL);
   EXPECT_EQ(1, ms_dispatcher_->stop_stream_counter());
   ChangeVideoSourceStateToLive();
   EXPECT_EQ(MediaStreamImplUnderTest::REQUEST_NOT_COMPLETE,
             ms_impl_->request_state());
 }
 
 // This test what happens if stop is called on a stream after the frame has
 // been reloaded.
 TEST_F(MediaStreamImplTest, StopStreamAfterReload) {
-  WebKit::WebMediaStreamDescriptor mixed_desc = RequestLocalMediaStream(true,
-                                                                        true);
+  WebKit::WebMediaStream mixed_desc = RequestLocalMediaStream(true, true);
   EXPECT_EQ(0, ms_dispatcher_->stop_stream_counter());
   EXPECT_EQ(1, ms_dispatcher_->request_stream_counter());
   ms_impl_->FrameWillClose(NULL);
   EXPECT_EQ(1, ms_dispatcher_->stop_stream_counter());
   ms_impl_->OnLocalMediaStreamStop(mixed_desc.label().utf8());
   EXPECT_EQ(1, ms_dispatcher_->stop_stream_counter());
 }
 
 }  // namespace content