Renamed WebMediaStreamComponent and WebMediaStreamDescriptor to WebMediaStreamTrack & WebMediaStream

webkit/support/test_media_stream_client.cc

Index: webkit/support/test_media_stream_client.cc
diff --git a/webkit/support/test_media_stream_client.cc b/webkit/support/test_media_stream_client.cc
index 2b55dc300194e34af7d76ba2ced58b596edba7c3..69df55ac474507dbe2471e3ce6188211e33d6a03 100644
--- a/webkit/support/test_media_stream_client.cc
+++ b/webkit/support/test_media_stream_client.cc
@@ -7,8 +7,8 @@
 #include "googleurl/src/gurl.h"
 #include "media/base/pipeline.h"
 #include "media/filters/video_frame_generator.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/WebMediaStreamTrack.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaStreamRegistry.h"
 #include "webkit/media/media_stream_audio_renderer.h"
@@ -23,11 +23,11 @@ static const int kVideoCaptureHeight = 288;
 static const int kVideoCaptureFrameDurationMs = 33;
 
 bool IsMockMediaStreamWithVideo(const WebURL& url) {
-  WebMediaStreamDescriptor descriptor(
+  WebMediaStream descriptor(
       WebMediaStreamRegistry::lookupMediaStreamDescriptor(url));
   if (descriptor.isNull())
     return false;
-  WebVector<WebMediaStreamComponent> videoSources;
+  WebVector<WebMediaStreamTrack> videoSources;
   descriptor.videoSources(videoSources);
   return videoSources.size() > 0;
 }