From 56e975eada25f5a4b9ca835a1b16d6876d51a1de Mon Sep 17 00:00:00 2001 From: "tommyw@chromium.org" Date: Mon, 4 Feb 2013 12:07:17 +0000 Subject: Renamed WebMediaStreamComponent and WebMediaStreamDescriptor to WebMediaStreamTrack & WebMediaStream Depends on a not yet landed WebKit patch BUG=173105 Review URL: https://chromiumcodereview.appspot.com/12084088 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180389 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/support/test_media_stream_client.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'webkit') diff --git a/webkit/support/test_media_stream_client.cc b/webkit/support/test_media_stream_client.cc index 2b55dc3..69df55a 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 videoSources; + WebVector videoSources; descriptor.videoSources(videoSources); return videoSources.size() > 0; } -- cgit v1.1