Renamed WebMediaStreamComponent and WebMediaStreamDescriptor to WebMediaStreamTrack & WebMediaStream

content/renderer/media/media_stream_impl_unittest.cc

Index: content/renderer/media/media_stream_impl_unittest.cc
diff --git a/content/renderer/media/media_stream_impl_unittest.cc b/content/renderer/media/media_stream_impl_unittest.cc
index c866064334062cca014bd27a80eb4db40bb9f5bc..23cc7369260e3c299690413d7af1c5d3cc3b9192 100644
--- a/content/renderer/media/media_stream_impl_unittest.cc
+++ b/content/renderer/media/media_stream_impl_unittest.cc
@@ -12,9 +12,9 @@
 #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"
 
@@ -49,28 +49,28 @@ class MediaStreamImplUnderTest : public MediaStreamImpl {
   }
 
   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_;
 };
 
@@ -87,7 +87,7 @@ class MediaStreamImplTest : public ::testing::Test {
                                                 dependency_factory_.get()));
   }
 
-  WebKit::WebMediaStreamDescriptor RequestLocalMediaStream(bool audio,
+  WebKit::WebMediaStream RequestLocalMediaStream(bool audio,
                                                            bool video) {
     ms_impl_->RequestUserMedia(audio, video);
     FakeMediaStreamDispatcherComplete();
@@ -99,7 +99,7 @@ class MediaStreamImplTest : public ::testing::Test {
     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()) {
@@ -158,23 +158,20 @@ class MediaStreamImplTest : public ::testing::Test {
 
 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);
@@ -244,8 +241,7 @@ TEST_F(MediaStreamImplTest, ReloadFrameWhileGeneratingSources) {
 // 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);